何博文 / trash · Commits

Commit 346a8256a607d30699df9edba5457b0efa25a573

Authored by youxiw2000
1 parent ce9f8106

a

Inline Side-by-side
Showing 36 changed files with 1127 additions and 47 deletions
trash-ui/src/api/business/credit.js 0 → 100644
  View file @346a825
  1 +import request from '@/utils/request'
  2 +
  3 +// 查询【请填写功能名称】列表
  4 +export function listCredit(query) {
  5 + return request({
  6 + url: '/business/ConstructionCredit/list',
  7 + method: 'get',
  8 + params: query
  9 + })
  10 +}
  11 +
  12 +export function getNames(query) {
  13 + return request({
  14 + url: '/business/ConstructionCredit/names',
  15 + method: 'get',
  16 + params: query
  17 + })
  18 +}
  19 +
  20 +// 查询【请填写功能名称】详细
  21 +export function getCredit(id) {
  22 + return request({
  23 + url: '/business/ConstructionCredit/' + id,
  24 + method: 'get'
  25 + })
  26 +}
  27 +
  28 +// 新增【请填写功能名称】
  29 +export function addCredit(data) {
  30 + return request({
  31 + url: '/business/ConstructionCredit',
  32 + method: 'post',
  33 + data: data
  34 + })
  35 +}
  36 +
  37 +// 修改【请填写功能名称】
  38 +export function updateCredit(data) {
  39 + return request({
  40 + url: '/business/ConstructionCredit',
  41 + method: 'put',
  42 + data: data
  43 + })
  44 +}
  45 +
  46 +// 删除【请填写功能名称】
  47 +export function delCredit(id) {
  48 + return request({
  49 + url: '/business/ConstructionCredit/' + id,
  50 + method: 'delete'
  51 + })
  52 +}
  53 +
  54 +// 导出【请填写功能名称】
  55 +export function exportCredit(query) {
  56 + return request({
  57 + url: '/business/ConstructionCredit/export',
  58 + method: 'get',
  59 + params: query
  60 + })
  61 +}
0 \ No newline at end of file 62 \ No newline at end of file
trash-ui/src/assets/logo/logo.jpg 0 → 100644
View file @346a825

11 KB
trash-ui/src/assets/logo/logo.png deleted 100644 → 0
View file @ce9f810

5.53 KB
trash-ui/src/layout/components/Sidebar/Logo.vue
  View file @346a825
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 </template> 14 </template>
15 15
16 <script> 16 <script>
17 -import logoImg from '@/assets/logo/logo.png' 17 +import logoImg from '@/assets/logo/logo.jpg'
18 18
19 export default { 19 export default {
20 name: 'SidebarLogo', 20 name: 'SidebarLogo',
trash-ui/src/permission.js
  View file @346a825
@@ -16,10 +16,12 @@ router.beforeEach((to, from, next) =&gt; { @@ -16,10 +16,12 @@ router.beforeEach((to, from, next) =&gt; {
16 NProgress.start() 16 NProgress.start()
17 var token = getToken(); 17 var token = getToken();
18 if(!token){ 18 if(!token){
19 - token = to.query.token;  
20 - if(token){ 19 + if( to.query.token ){
  20 + token = to.query.token;
21 Cookies.set("token", token, { expires: 30 }); 21 Cookies.set("token", token, { expires: 30 });
22 - } 22 + }else{
  23 + Cookies.remove("token");
  24 + }
23 } 25 }
24 26
25 if (token) { 27 if (token) {
trash-ui/src/router/index.js
  View file @346a825
@@ -117,6 +117,42 @@ export const constantRoutes = [ @@ -117,6 +117,42 @@ export const constantRoutes = [
117 meta: { title: '修改生成配置' } 117 meta: { title: '修改生成配置' }
118 } 118 }
119 ] 119 ]
  120 + },
  121 + {
  122 + path: '/business',
  123 + component: Layout,
  124 + hidden: true,
  125 + children: [
  126 + {
  127 + path: 'credit/ConstructionCredit',
  128 + component: (resolve) => require(['@/views/business/ConstructionCredit'], resolve),
  129 + name: '工地失信管理',
  130 + meta: { title: '工地失信管理' }
  131 + },
  132 + // {
  133 + // path: 'credit/EarthSitesCredit',
  134 + // component: (resolve) => require(['@/views/business/EarthSitesCredit'], resolve),
  135 + // name: '消纳场失信管理',
  136 + // meta: { title: '消纳场失信管理' }
  137 + // },{
  138 + // path: 'credit/CompanyCredit',
  139 + // component: (resolve) => require(['@/views/businessCompanyCredit'], resolve),
  140 + // name: '企业失信管理',
  141 + // meta: { title: '企业失信管理' }
  142 + // },
  143 + // {
  144 + // path: 'credit/TruckCredit',
  145 + // component: (resolve) => require(['@/views/business/TruckCredit'], resolve),
  146 + // name: '车辆失信管理',
  147 + // meta: { title: '车辆失信管理' }
  148 + // },
  149 + // {
  150 + // path: 'credit/DriverCredit',
  151 + // component: (resolve) => require(['@/views/business/DriverCredit'], resolve),
  152 + // name: '驾驶员失信管理',
  153 + // meta: { title: '驾驶员失信管理' }
  154 + // }
  155 + ]
120 } 156 }
121 ] 157 ]
122 158
trash-ui/src/views/activiti/task/index.vue
  View file @346a825
@@ -90,7 +90,7 @@ @@ -90,7 +90,7 @@
90 formDataShow, 90 formDataShow,
91 formDataSave 91 formDataSave
92 } from "@/api/activiti/task"; 92 } from "@/api/activiti/task";
93 - import leaveHistoryForm from "@/views/workflow/leave/leaveHistoryForm"; 93 + import leaveHistoryForm from "@/views/workflow/leaveHistoryForm";
94 94
95 export default { 95 export default {
96 name: "task", 96 name: "task",
trash-ui/src/views/activiti/taskhistory/end.vue
  View file @346a825
@@ -75,8 +75,8 @@ @@ -75,8 +75,8 @@
75 listEndTask, 75 listEndTask,
76 formDataShow 76 formDataShow
77 } from "@/api/activiti/taskhistory"; 77 } from "@/api/activiti/taskhistory";
78 - import leaveHistoryForm from "@/views/workflow/leave/leaveHistoryForm";  
79 - import earthSitesForm from "@/views/workflow/leave/earthSitesForm"; 78 + import leaveHistoryForm from "@/views/workflow/leaveHistoryForm";
  79 + import earthSitesForm from "@/views/workflow/earthSitesForm";
80 80
81 export default { 81 export default {
82 name: "taskHistory", 82 name: "taskHistory",
trash-ui/src/views/activiti/taskhistory/index.vue
  View file @346a825
@@ -75,7 +75,7 @@ @@ -75,7 +75,7 @@
75 listTask, 75 listTask,
76 formDataShow 76 formDataShow
77 } from "@/api/activiti/taskhistory"; 77 } from "@/api/activiti/taskhistory";
78 - import leaveHistoryForm from "@/views/workflow/leave/leaveHistoryForm"; 78 + import leaveHistoryForm from "@/views/workflow/leaveHistoryForm";
79 79
80 export default { 80 export default {
81 name: "taskHistory", 81 name: "taskHistory",
trash-ui/src/views/business/ConstructionCredit/index.vue 0 → 100644
  View file @346a825
  1 +<template>
  2 + <div class="app-container">
  3 + <el-row :gutter="10" class="mb8">
  4 + <el-col :span="1.5">
  5 + <el-button :class="{'el-button':true, 'el-button--primary':this.queryParams.status==0}" size="mini" @click="getData(1);" >失信工地</el-button>
  6 + </el-col>
  7 + <el-col :span="1.5">
  8 + <el-button :class="{'el-button':true,'el-button--primary':this.queryParams.status==1}" size="mini" @click="getData(1);">历史失信工地</el-button>
  9 + </el-col>
  10 + </el-row>
  11 +
  12 + <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
  13 + <el-row type="flex" justify="center">
  14 + <el-form-item label="工地名称" prop="name">
  15 + <el-select v-model="queryParams.name"
  16 + filterable
  17 + reserve-keyword
  18 + placeholder="工地名称"
  19 + clearable
  20 + size="small"
  21 + :loading="loading">
  22 + <el-option
  23 + v-for="item in dictNames"
  24 + :label="item"
  25 + :value="item">
  26 + </el-option>
  27 + </el-select>
  28 + </el-form-item>
  29 + <el-form-item label="所属场地" prop="place">
  30 + <el-select v-model="queryParams.place" placeholder="所属场地" clearable size="small">
  31 + <el-option label="请选择字典生成" value="" />
  32 + </el-select>
  33 + </el-form-item>
  34 + </el-row>
  35 + <el-row type="flex" justify="center">
  36 + <el-form-item label="垃圾类型" prop="type">
  37 + <el-select v-model="queryParams.type" placeholder="建筑垃圾类型" clearable size="small">
  38 + <el-option label="请选择字典生成" value="" />
  39 + </el-select>
  40 + </el-form-item>
  41 + <el-form-item label="失信日期" prop="time">
  42 + <el-date-picker clearable size="small" style="width: 200px" v-model="queryParams.time" type="date"
  43 + value-format="yyyy-MM-dd" placeholder="失信日期">
  44 + </el-date-picker>
  45 + </el-form-item>
  46 + </el-row>
  47 +
  48 + </el-form>
  49 +
  50 + <el-row :gutter="10" class="mb8">
  51 + <el-col :span="1.5">
  52 + <el-button type="primary" size="mini" @click="handleAdd" v-hasPermi="['business:ConstructionCredit:add']">新增</el-button>
  53 + </el-col>
  54 + <el-col :span="1.5">
  55 + <el-button size="mini" @click="handleExport" v-hasPermi="['business:ConstructionCredit:export']">导出</el-button>
  56 + </el-col>
  57 +
  58 + <el-col :span="20" style="height: 1px;"></el-col>
  59 + <el-col :span="1.5">
  60 + <el-button type="primary" size="mini" @click="handleQuery">查询</el-button>
  61 + </el-col>
  62 + <el-col :span="1.5">
  63 + <el-button size="mini" @click="resetQuery">重置</el-button>
  64 + </el-col>
  65 + </el-row>
  66 +
  67 + <el-table v-loading="loading" :data="creditList" @selection-change="handleSelectionChange" :cell-style="colStyle" border>
  68 + <el-table-column label="序号" align="center" prop="id" />
  69 + <el-table-column label="工地名称" align="center" prop="name" />
  70 + <el-table-column label="建筑垃圾类型" align="center" prop="type" />
  71 + <el-table-column label="失信时间" align="center" prop="time" width="180">
  72 + <template slot-scope="scope">
  73 + <span>{{ parseTime(scope.row.time, '{y}-{m}-{d}') }}</span>
  74 + </template>
  75 + </el-table-column>
  76 + <el-table-column label="所属区域" align="center" prop="place" />
  77 + <el-table-column label="失信原因" align="center" prop="reason" />
  78 + <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
  79 + <template slot-scope="scope">
  80 + <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['business:ConstructionCredit:edit']" v-if="scope.row.lostCredit==1">撤销失信</el-button>
  81 + <el-button size="mini" type="text" icon="el-icon-edit" @click="getDataInfo(scope.row)" v-if="scope.row.lostCredit==0">查看</el-button>
  82 + </template>
  83 + </el-table-column>
  84 + </el-table>
  85 +
  86 + <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
  87 + @pagination="getList" />
  88 +
  89 + <!-- 添加或修改工地对话框 -->
  90 + <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
  91 + <el-form ref="form" :model="form" :rules="rules" label-width="120px">
  92 + <el-form-item label="工地名称" prop="name">
  93 + <el-select
  94 + v-model="form.name"
  95 + filterable
  96 + reserve-keyword
  97 + placeholder="工地名称">
  98 + <el-option
  99 + @click.native="getObjId(item.id)"
  100 + v-for="item in names"
  101 + :key="item.value"
  102 + :label="item.label"
  103 + :value="item.label">
  104 + </el-option>
  105 + </el-select>
  106 + </el-form-item>
  107 +
  108 + <el-form-item label="建筑垃圾类型" prop="type">
  109 + <el-select
  110 + v-model="form.type"
  111 + filterable
  112 + reserve-keyword
  113 + placeholder="建筑垃圾类型">
  114 + <el-option
  115 + v-for="item in types"
  116 + :key="item.id"
  117 + :label="item.label"
  118 + :value="item.value">
  119 + </el-option>
  120 + </el-select>
  121 + </el-form-item>
  122 + <el-form-item label="所属区域" prop="place">
  123 + <el-select
  124 + v-model="form.place"
  125 + filterable
  126 + reserve-keyword
  127 + placeholder="所属区域">
  128 + <el-option
  129 + v-for="item in places"
  130 + :key="item.id"
  131 + :label="item.label"
  132 + :value="item.value">
  133 + </el-option>
  134 + </el-select>
  135 + </el-form-item>
  136 + <el-form-item label="失信原因" prop="reason">
  137 + <el-input v-model="form.reason" placeholder="失信原因" />
  138 + </el-form-item>
  139 + <el-input v-model="form.lostCredit" value="1" type="hidden" />
  140 + <el-input v-model="form.objectId" type="hidden" />
  141 + </el-form>
  142 + <div slot="footer" class="dialog-footer">
  143 + <el-button type="primary" @click="submitForm">保存</el-button>
  144 + <el-button @click="cancel">退出</el-button>
  145 + </div>
  146 + </el-dialog>
  147 +
  148 +
  149 + <el-dialog title="撤销失信" :visible.sync="isEdit" width="500px" append-to-body>
  150 + <el-form ref="form" :model="updateForm" :rules="rules" label-width="120px">
  151 + <el-form-item label="情况说明" prop="reason">
  152 + <el-input v-model="updateForm.reason" type="textarea" maxlength="200" show-word-limit/>
  153 + </el-form-item>
  154 + </el-form>
  155 + <div slot="footer" class="dialog-footer">
  156 + <el-button type="primary" @click="submitForm">保存</el-button>
  157 + <el-button @click="cancel">退出</el-button>
  158 + </div>
  159 + </el-dialog>
  160 + </div>
  161 +</template>
  162 +
  163 +<script>
  164 + import {
  165 + listCredit,
  166 + getCredit,
  167 + delCredit,
  168 + addCredit,
  169 + updateCredit,
  170 + exportCredit,
  171 + getNames
  172 + } from "@/api/business/credit";
  173 +
  174 + export default {
  175 + name: "Credit",
  176 + data() {
  177 + return {
  178 + // 遮罩层
  179 + loading: true,
  180 + // 选中数组
  181 + ids: [],
  182 + // 非单个禁用
  183 + single: true,
  184 + // 非多个禁用
  185 + multiple: true,
  186 + // 显示搜索条件
  187 + showSearch: true,
  188 +
  189 + // 总条数
  190 + total: 0,
  191 + // 工地表格数据
  192 + creditList: [],
  193 + dictNames:[],
  194 + dictTypes:[],
  195 + dictPlaces:[],
  196 + names:[{label:"工地A",value:"工地A",id:"a"},
  197 + {label:"工地B",value:"工地B",id:"B"},
  198 + {label:"工地C",value:"工地C",id:"C"},
  199 + {label:"工地D",value:"工地D",id:"D"},
  200 + {label:"工地E",value:"工地E",id:"E"}],
  201 + types:[{label:"工地A",value:"工地A",id:"a"},
  202 + {label:"工地B",value:"工地B",id:"B"},
  203 + {label:"工地C",value:"工地C",id:"C"},
  204 + {label:"工地D",value:"工地D",id:"D"},
  205 + {label:"工地E",value:"工地E",id:"E"}],
  206 + places:[{label:"工地A",value:"工地A",id:"a"},
  207 + {label:"工地B",value:"工地B",id:"B"},
  208 + {label:"工地C",value:"工地C",id:"C"},
  209 + {label:"工地D",value:"工地D",id:"D"},
  210 + {label:"工地E",value:"工地E",id:"E"}],
  211 + // 弹出层标题
  212 + title: "",
  213 + // 是否显示弹出层
  214 + open: false,
  215 + isEdit:false,
  216 + // 查询参数
  217 + queryParams: {
  218 + pageNum: 1,
  219 + pageSize: 10,
  220 + name: null,
  221 + type: null,
  222 + time: null,
  223 + place: null,
  224 + reason: null,
  225 + status: 0,
  226 + lostCredit: 1
  227 + },
  228 + // 表单参数
  229 + form: {},
  230 + updateForm:{},
  231 + // 表单校验
  232 + rules: {name: [
  233 + { required: true, message: '请选择工地', trigger: 'change' },
  234 + ],type: [
  235 + { required: true, message: '请选择建筑垃圾类型', trigger: 'change' },
  236 + ],place: [
  237 + { required: true, message: '请选择所属区域', trigger: 'change' },
  238 + ],time: [
  239 + { required: true, message: '请选择失信时间', trigger: 'change' },
  240 + ],reason: [
  241 + { required: true, message: '请填写原因', trigger: 'blur' },
  242 + ]}
  243 + };
  244 + },
  245 + created() {
  246 + this.getList();
  247 + this.getNamesData();
  248 + },
  249 + methods: {
  250 + getNamesData(){
  251 + getNames(this.queryParams).then(response => {
  252 + this.dictNames = response;
  253 + });
  254 + },
  255 + getData(stauts){
  256 + this.queryParams.lostCredit=stauts;
  257 + this.getList();
  258 + },
  259 + colStyle(obj){
  260 + if(obj.column.property == "id"){
  261 + return {background:"#f8f8f9"}
  262 + }
  263 + },
  264 + getObjId(a){
  265 + this.form.objectId = a;
  266 + },
  267 + getList() {
  268 + this.loading = true;
  269 + listCredit(this.queryParams).then(response => {
  270 + this.creditList = response.rows;
  271 + this.total = response.total;
  272 + this.loading = false;
  273 + });
  274 + },
  275 + // 取消按钮
  276 + cancel() {
  277 + this.open = false;
  278 + this.isEdit = false;
  279 + this.reset();
  280 + },
  281 + // 表单重置
  282 + reset() {
  283 + this.form = {
  284 + id: null,
  285 + name: null,
  286 + type: null,
  287 + time: null,
  288 + place: null,
  289 + reason: null,
  290 + lostCredit: null,
  291 + objectId: null,
  292 + };
  293 + this.resetForm("form");
  294 + },
  295 + /** 搜索按钮操作 */
  296 + handleQuery() {
  297 + this.queryParams.pageNum = 1;
  298 + this.getList();
  299 + },
  300 + /** 重置按钮操作 */
  301 + resetQuery() {
  302 + this.resetForm("queryForm");
  303 + console.log(this.queryParams);
  304 + this.handleQuery();
  305 + },
  306 + // 多选框选中数据
  307 + handleSelectionChange(selection) {
  308 + this.ids = selection.map(item => item.id)
  309 + this.single = selection.length !== 1
  310 + this.multiple = !selection.length
  311 + },
  312 + /** 新增按钮操作 */
  313 + handleAdd() {
  314 + this.reset();
  315 + this.open = true;
  316 + this.title = "添加工地";
  317 + },
  318 + /** 修改按钮操作 */
  319 + handleUpdate(row) {
  320 + this.reset();
  321 + const id = row.id || this.ids
  322 + getCredit(id).then(response => {
  323 + this.form = response.data;
  324 + this.isEdit = true;
  325 + });
  326 + },
  327 + /** 提交按钮 */
  328 + submitForm() {
  329 + this.$refs["form"].validate(valid => {
  330 + if (valid) {
  331 + if (this.form.id != null) {
  332 + this.updateForm.id = this.form.id;
  333 + updateCredit(this.updateForm).then(response => {
  334 + this.msgSuccess("撤销成功");
  335 + this.isEdit = false;
  336 + this.getList();
  337 + });
  338 + } else {
  339 + this.form.lostCredit = 1;
  340 + addCredit(this.form).then(response => {
  341 + this.msgSuccess("新增成功");
  342 + this.open = false;
  343 + this.getList();
  344 + this.getNamesData();
  345 + });
  346 + }
  347 + }
  348 + });
  349 + },
  350 + handleExport() {
  351 + const queryParams = this.queryParams;
  352 + this.$confirm('是否确认导出所有工地数据项?', "警告", {
  353 + confirmButtonText: "确定",
  354 + cancelButtonText: "取消",
  355 + type: "warning"
  356 + }).then(function() {
  357 + return exportCredit(queryParams);
  358 + }).then(response => {
  359 + this.download(response.msg);
  360 + })
  361 + }
  362 + }
  363 + };
  364 +</script>
trash-ui/src/views/login.vue
  View file @346a825
1 <template> 1 <template>
2 <div class="login"> 2 <div class="login">
3 <div class="main" > 3 <div class="main" >
4 - <img src="@/assets/logo/logo.png" alt="" class="img1">  
5 - <img src="@/assets/image/img_bg.png" alt="" class="img2">  
6 - <h3>OA系统管理</h3>  
7 - <h4>OA SYSTEM MANAGEMENT</h4> 4 + <img src="@/assets/logo/logo.jpg" alt="" class="img2">
8 <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form"> 5 <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
9 <h2 class="title">欢迎登录</h2> 6 <h2 class="title">欢迎登录</h2>
10 <el-form-item prop="username"> 7 <el-form-item prop="username">
@@ -56,11 +53,6 @@ @@ -56,11 +53,6 @@
56 </el-form-item> 53 </el-form-item>
57 </el-form> 54 </el-form>
58 </div> 55 </div>
59 -  
60 - <!-- 底部 -->  
61 - <div class="el-login-footer">  
62 - <span>© 2020 All Rights Reserved. trashchina.com<br> 蒙ICP备2020003903号 <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAAUCAMAAAC3SZ14AAACBFBMVEVHcEzknkbrvFL04pfow2v//9apiXD/5K3ks1Pq0o736ajt3I3w5MDRq3bn0o7t7bfoxmTy56Tw26b256jqy3vbo1HgrV/v4LH0u1HpwHm+lnP36cv05admSVDcqV+WcVFsW2KIgHjZol/48cPfo1DOkEXdp0/MilTpwGzlrVLpwFjjr1zqzIbduX3msVjTmmXltFLr2HzkvmDt2YHw3HbjuGTz3HjgsFJfPEHqxXHisHOldFrPsYn10WfXvJfw4oh0cXVcRVmFeG/bwZulgWmsjGGmbkHNrH1SOVjywWLfs27vqkndr3Hxy5yMgXXrvlnouFQhI3MbHHjhpkrsx1/enUfVHBXXjD7ttlPTJRl3dnrIRSXXLBfosk3pwV7lvGP10mH0ylzZRiTXZy3ghz/npEEXC2LXVCjrbzLhTyLnu1vs0Wrpx2bzw1boqk+pkmTzyGi7qnaRZUTWlVGzHhcoD1mdCBn3NRPbeTvjkz5tYmnWOB+xo3vPBwS6VSvLVCTQFg7Xr2RseosiFGceKYotQozuezTalUbtwVmTWDPr22zgMxq3llZgHkuKemeFiI1EAEBuJ0rhfDPZEQ3Xu3DZbjjUXDBVV3RcAz2+Lh+il3WpCh21Li7FYT/pZi/dbjCzn2m9pm3kol5pV1rrXB/aBwgTDXO/sIaVhHqxl3aggFekcEYg5SEkAAAAc3RSTlMA/PqN3gbRBP4VKVE9xiQO53lZZuL+2078sKIuQ/vj/v395zXYqst0wuT0z5xi4zrsytiM7OPw+vnN0tuk8IWv+vjqgN7w76/6sX/trDbr///////////////////////////////////////////////+NgsVowAAAXJJREFUGNNjYAACdk4eZzY2Ox5OVgYoYBeXsnYrknd1kRKHiUmzWXTWpc8vzpdlkwYLsCq7yxYlh1UnxaTMUrDhAqlT5vVYPKk7LLK6IWZRlCMvF9Agbr8g+SWTI8PCImvnzQp04mZn8PVUDFqduTQyKSmmNnNhoIM9D4OX94qgVW0N0eHBFTFtCwIVbZkZfBhXtiik1kcnV0xN8a8KqpGQZFCqbGxtrstIj56WnjG3uXVKqhiDUnhE07Ky8sz65Izy2WlN/oxiDLyMictbJpSVlMyMnjMjsLCAQ5LBKjSvoD8wrbR3YmlaUFRIBIclg4hoMWN8YV9Ufk/V9KjG1FAOEQZBFtHwFImExNyIkK6OynZzFmEGfmEBjvBQoIh/QkJeaDyLECsDuxBLSBaHf1xcSEAwR06OKdBDnMxm2fFZAQH+AcHBAXHZJsycDOxcxkYGTEyxsbEB/loChoJ87MDQ4dRXV1VT0dTT1tDR5eNnYAAAHI5j3PTE3yIAAAAASUVORK5CYII=" alt=""></span>  
63 - </div>  
64 </div> 56 </div>
65 </template> 57 </template>
66 58
trash-ui/src/views/tool/build/index.vue
  View file @346a825
@@ -157,7 +157,7 @@ import { @@ -157,7 +157,7 @@ import {
157 import { makeUpJs } from '@/utils/generator/js' 157 import { makeUpJs } from '@/utils/generator/js'
158 import { makeUpCss } from '@/utils/generator/css' 158 import { makeUpCss } from '@/utils/generator/css'
159 import drawingDefalut from '@/utils/generator/drawingDefalut' 159 import drawingDefalut from '@/utils/generator/drawingDefalut'
160 -import logo from '@/assets/logo/logo.png' 160 +import logo from '@/assets/logo/logo.jpg'
161 import CodeTypeDialog from './CodeTypeDialog' 161 import CodeTypeDialog from './CodeTypeDialog'
162 import DraggableItem from './DraggableItem' 162 import DraggableItem from './DraggableItem'
163 163
trash-ui/src/views/workflow/leave/earthSitesForm.vue renamed to trash-ui/src/views/workflow/earthSitesForm.vue
  View file @346a825
trash-ui/src/views/workflow/leave/index.vue renamed to trash-ui/src/views/workflow/index.vue
  View file @346a825
trash-ui/src/views/workflow/leave/leaveAll.vue renamed to trash-ui/src/views/workflow/leaveAll.vue
  View file @346a825
trash-ui/src/views/workflow/leave/leaveHistoryForm.vue renamed to trash-ui/src/views/workflow/leaveHistoryForm.vue
  View file @346a825
trash-workFlow/src/main/java/com/trash/business/controller/ConstructionCreditController.java 0 → 100644
  View file @346a825
  1 +package com.trash.business.controller;
  2 +
  3 +import java.util.List;
  4 +
  5 +import org.springframework.beans.factory.annotation.Autowired;
  6 +import org.springframework.security.access.prepost.PreAuthorize;
  7 +import org.springframework.web.bind.annotation.DeleteMapping;
  8 +import org.springframework.web.bind.annotation.GetMapping;
  9 +import org.springframework.web.bind.annotation.PathVariable;
  10 +import org.springframework.web.bind.annotation.PostMapping;
  11 +import org.springframework.web.bind.annotation.PutMapping;
  12 +import org.springframework.web.bind.annotation.RequestBody;
  13 +import org.springframework.web.bind.annotation.RequestMapping;
  14 +import org.springframework.web.bind.annotation.RestController;
  15 +
  16 +import com.trash.business.domain.ConstructionCredit;
  17 +import com.trash.business.service.IConstructionCreditService;
  18 +import com.trash.common.annotation.Log;
  19 +import com.trash.common.core.controller.BaseController;
  20 +import com.trash.common.core.domain.AjaxResult;
  21 +import com.trash.common.core.page.TableDataInfo;
  22 +import com.trash.common.enums.BusinessType;
  23 +import com.trash.common.utils.poi.ExcelUtil;
  24 +
  25 +/**
  26 + * 工地失信Controller
  27 + *
  28 + * @author trash
  29 + * @date 2023-04-21
  30 + */
  31 +@RestController
  32 +@RequestMapping("/business/ConstructionCredit")
  33 +public class ConstructionCreditController extends BaseController
  34 +{
  35 + @Autowired
  36 + private IConstructionCreditService constructionCreditService;
  37 +
  38 + /**
  39 + * 查询工地失信列表
  40 + */
  41 + @PreAuthorize("@ss.hasPermi('business:ConstructionCredit:list')")
  42 + @GetMapping("/list")
  43 + public TableDataInfo list(ConstructionCredit constructionCredit)
  44 + {
  45 + startPage();
  46 + List<ConstructionCredit> list = constructionCreditService.selectConstructionCreditList(constructionCredit);
  47 + return getDataTable(list);
  48 + }
  49 +
  50 + /**
  51 + * 导出工地失信列表
  52 + */
  53 + @PreAuthorize("@ss.hasPermi('business:ConstructionCredit:export')")
  54 + @Log(title = "工地失信", businessType = BusinessType.EXPORT)
  55 + @GetMapping("/export")
  56 + public AjaxResult export(ConstructionCredit constructionCredit)
  57 + {
  58 + List<ConstructionCredit> list = constructionCreditService.selectConstructionCreditList(constructionCredit);
  59 + ExcelUtil<ConstructionCredit> util = new ExcelUtil<ConstructionCredit>(ConstructionCredit.class);
  60 + return util.exportExcel(list, "credit");
  61 + }
  62 +
  63 + /**
  64 + * 获取工地失信详细信息
  65 + */
  66 + @PreAuthorize("@ss.hasPermi('business:ConstructionCredit:query')")
  67 + @GetMapping(value = "/{id}")
  68 + public AjaxResult getInfo(@PathVariable("id") Long id)
  69 + {
  70 + return AjaxResult.success(constructionCreditService.selectConstructionCreditById(id));
  71 + }
  72 +
  73 + /**
  74 + * 新增工地失信
  75 + */
  76 + @PreAuthorize("@ss.hasPermi('business:ConstructionCredit:add')")
  77 + @Log(title = "工地失信", businessType = BusinessType.INSERT)
  78 + @PostMapping
  79 + public AjaxResult add(@RequestBody ConstructionCredit constructionCredit)
  80 + {
  81 + return toAjax(constructionCreditService.insertConstructionCredit(constructionCredit));
  82 + }
  83 +
  84 + /**
  85 + * 修改工地失信
  86 + */
  87 + @PreAuthorize("@ss.hasPermi('business:ConstructionCredit:edit')")
  88 + @Log(title = "工地失信", businessType = BusinessType.UPDATE)
  89 + @PutMapping
  90 + public AjaxResult edit(@RequestBody ConstructionCredit constructionCredit)
  91 + {
  92 + return toAjax(constructionCreditService.updateConstructionCredit(constructionCredit));
  93 + }
  94 +
  95 + @GetMapping("/names")
  96 + public List<String> getNames(ConstructionCredit constructionCredit)
  97 + {
  98 + return constructionCreditService.getNames(constructionCredit);
  99 + }
  100 +
  101 + /**
  102 + * 删除工地失信
  103 + */
  104 + @PreAuthorize("@ss.hasPermi('business:ConstructionCredit:remove')")
  105 + @Log(title = "工地失信", businessType = BusinessType.DELETE)
  106 + @DeleteMapping("/{ids}")
  107 + public AjaxResult remove(@PathVariable Long[] ids)
  108 + {
  109 + return toAjax(constructionCreditService.deleteConstructionCreditByIds(ids));
  110 + }
  111 +}
trash-workFlow/src/main/java/com/trash/business/domain/ConstructionCredit.java 0 → 100644
  View file @346a825
  1 +package com.trash.business.domain;
  2 +
  3 +import java.util.Date;
  4 +import com.fasterxml.jackson.annotation.JsonFormat;
  5 +import org.apache.commons.lang3.builder.ToStringBuilder;
  6 +import org.apache.commons.lang3.builder.ToStringStyle;
  7 +import com.trash.common.annotation.Excel;
  8 +import com.trash.common.core.domain.BaseEntity;
  9 +
  10 +/**
  11 + * 【请填写功能名称】对象 construction_credit
  12 + *
  13 + * @author trash
  14 + * @date 2023-04-21
  15 + */
  16 +public class ConstructionCredit extends BaseEntity
  17 +{
  18 + private static final long serialVersionUID = 1L;
  19 +
  20 + private Long id;
  21 +
  22 + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
  23 + private String name;
  24 +
  25 + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
  26 + private String type;
  27 +
  28 + @JsonFormat(pattern = "yyyy-MM-dd")
  29 + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
  30 + private Date time;
  31 +
  32 + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
  33 + private String place;
  34 +
  35 + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
  36 + private String reason;
  37 +
  38 + @Excel(name = "0当前 1历史")
  39 + private Long status;
  40 +
  41 + @Excel(name = "0撤销 1失信")
  42 + private Long lostCredit;
  43 +
  44 + @Excel(name = "${comment}")
  45 + private String objectId;
  46 +
  47 +
  48 + public void setId(Long id)
  49 + {
  50 + this.id = id;
  51 + }
  52 +
  53 + public Long getId()
  54 + {
  55 + return id;
  56 + }
  57 + public void setName(String name)
  58 + {
  59 + this.name = name;
  60 + }
  61 +
  62 + public String getName()
  63 + {
  64 + return name;
  65 + }
  66 + public void setType(String type)
  67 + {
  68 + this.type = type;
  69 + }
  70 +
  71 + public String getType()
  72 + {
  73 + return type;
  74 + }
  75 + public void setTime(Date time)
  76 + {
  77 + this.time = time;
  78 + }
  79 +
  80 + public Date getTime()
  81 + {
  82 + return time;
  83 + }
  84 + public void setPlace(String place)
  85 + {
  86 + this.place = place;
  87 + }
  88 +
  89 + public String getPlace()
  90 + {
  91 + return place;
  92 + }
  93 + public void setReason(String reason)
  94 + {
  95 + this.reason = reason;
  96 + }
  97 +
  98 + public String getReason()
  99 + {
  100 + return reason;
  101 + }
  102 + public void setStatus(Long status)
  103 + {
  104 + this.status = status;
  105 + }
  106 +
  107 + public Long getStatus()
  108 + {
  109 + return status;
  110 + }
  111 + public void setLostCredit(Long lostCredit)
  112 + {
  113 + this.lostCredit = lostCredit;
  114 + }
  115 +
  116 + public Long getLostCredit()
  117 + {
  118 + return lostCredit;
  119 + }
  120 +
  121 +
  122 +
  123 + public String getObjectId() {
  124 + return objectId;
  125 + }
  126 +
  127 + public void setObjectId(String object_id) {
  128 + this.objectId = object_id;
  129 + }
  130 +
  131 + @Override
  132 + public String toString() {
  133 + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
  134 + .append("id", getId())
  135 + .append("name", getName())
  136 + .append("type", getType())
  137 + .append("time", getTime())
  138 + .append("place", getPlace())
  139 + .append("reason", getReason())
  140 + .append("status", getStatus())
  141 + .append("lostCredit", getLostCredit())
  142 + .toString();
  143 + }
  144 +
  145 +}
trash-workFlow/src/main/java/com/trash/business/mapper/ConstructionCreditMapper.java 0 → 100644
  View file @346a825
  1 +package com.trash.business.mapper;
  2 +
  3 +import java.util.List;
  4 +
  5 +import com.trash.business.domain.ConstructionCredit;
  6 +
  7 +/**
  8 + * 【请填写功能名称】Mapper接口
  9 + *
  10 + * @author trash
  11 + * @date 2023-04-21
  12 + */
  13 +public interface ConstructionCreditMapper
  14 +{
  15 + /**
  16 + * 查询【请填写功能名称】
  17 + *
  18 + * @param id 【请填写功能名称】ID
  19 + * @return 【请填写功能名称】
  20 + */
  21 + public ConstructionCredit selectConstructionCreditById(Long id);
  22 +
  23 + /**
  24 + * 查询【请填写功能名称】列表
  25 + *
  26 + * @param constructionCredit 【请填写功能名称】
  27 + * @return 【请填写功能名称】集合
  28 + */
  29 + public List<ConstructionCredit> selectConstructionCreditList(ConstructionCredit constructionCredit);
  30 +
  31 + /**
  32 + * 新增【请填写功能名称】
  33 + *
  34 + * @param constructionCredit 【请填写功能名称】
  35 + * @return 结果
  36 + */
  37 + public int insertConstructionCredit(ConstructionCredit constructionCredit);
  38 +
  39 + /**
  40 + * 修改【请填写功能名称】
  41 + *
  42 + * @param constructionCredit 【请填写功能名称】
  43 + * @return 结果
  44 + */
  45 + public int updateConstructionCredit(ConstructionCredit constructionCredit);
  46 +
  47 + /**
  48 + * 删除【请填写功能名称】
  49 + *
  50 + * @param id 【请填写功能名称】ID
  51 + * @return 结果
  52 + */
  53 + public int deleteConstructionCreditById(Long id);
  54 +
  55 + /**
  56 + * 批量删除【请填写功能名称】
  57 + *
  58 + * @param ids 需要删除的数据ID
  59 + * @return 结果
  60 + */
  61 + public int deleteConstructionCreditByIds(Long[] ids);
  62 +
  63 + public List<String> getNames(ConstructionCredit constructionCredit);
  64 +}
trash-workFlow/src/main/java/com/trash/business/service/IConstructionCreditService.java 0 → 100644
  View file @346a825
  1 +package com.trash.business.service;
  2 +
  3 +import java.util.List;
  4 +import java.util.Map;
  5 +
  6 +import com.trash.business.domain.ConstructionCredit;
  7 +
  8 +/**
  9 + * 【请填写功能名称】Service接口
  10 + *
  11 + * @author trash
  12 + * @date 2023-04-21
  13 + */
  14 +public interface IConstructionCreditService
  15 +{
  16 + /**
  17 + * 查询【请填写功能名称】
  18 + *
  19 + * @param id 【请填写功能名称】ID
  20 + * @return 【请填写功能名称】
  21 + */
  22 + public ConstructionCredit selectConstructionCreditById(Long id);
  23 +
  24 + /**
  25 + * 查询【请填写功能名称】列表
  26 + *
  27 + * @param constructionCredit 【请填写功能名称】
  28 + * @return 【请填写功能名称】集合
  29 + */
  30 + public List<ConstructionCredit> selectConstructionCreditList(ConstructionCredit constructionCredit);
  31 +
  32 + /**
  33 + * 新增【请填写功能名称】
  34 + *
  35 + * @param constructionCredit 【请填写功能名称】
  36 + * @return 结果
  37 + */
  38 + public int insertConstructionCredit(ConstructionCredit constructionCredit);
  39 +
  40 + /**
  41 + * 修改【请填写功能名称】
  42 + *
  43 + * @param constructionCredit 【请填写功能名称】
  44 + * @return 结果
  45 + */
  46 + public int updateConstructionCredit(ConstructionCredit constructionCredit);
  47 +
  48 + /**
  49 + * 批量删除【请填写功能名称】
  50 + *
  51 + * @param ids 需要删除的【请填写功能名称】ID
  52 + * @return 结果
  53 + */
  54 + public int deleteConstructionCreditByIds(Long[] ids);
  55 +
  56 + /**
  57 + * 删除【请填写功能名称】信息
  58 + *
  59 + * @param id 【请填写功能名称】ID
  60 + * @return 结果
  61 + */
  62 + public int deleteConstructionCreditById(Long id);
  63 +
  64 + public List<String> getNames(ConstructionCredit constructionCredit);
  65 +}
trash-workFlow/src/main/java/com/trash/business/service/impl/ConstructionCreditServiceImpl.java 0 → 100644
  View file @346a825
  1 +package com.trash.business.service.impl;
  2 +
  3 +import java.util.Date;
  4 +import java.util.List;
  5 +
  6 +import org.apache.xmlbeans.impl.xb.xsdschema.Public;
  7 +import org.springframework.beans.factory.annotation.Autowired;
  8 +import org.springframework.stereotype.Service;
  9 +import org.springframework.transaction.annotation.Transactional;
  10 +
  11 +import com.trash.business.domain.ConstructionCredit;
  12 +import com.trash.business.mapper.ConstructionCreditMapper;
  13 +import com.trash.business.service.IConstructionCreditService;
  14 +
  15 +/**
  16 + * 【请填写功能名称】Service业务层处理
  17 + *
  18 + * @author trash
  19 + * @date 2023-04-21
  20 + */
  21 +@Service
  22 +public class ConstructionCreditServiceImpl implements IConstructionCreditService
  23 +{
  24 + @Autowired
  25 + private ConstructionCreditMapper constructionCreditMapper;
  26 +
  27 + /**
  28 + * 查询【请填写功能名称】
  29 + *
  30 + * @param id 【请填写功能名称】ID
  31 + * @return 【请填写功能名称】
  32 + */
  33 + @Override
  34 + public ConstructionCredit selectConstructionCreditById(Long id)
  35 + {
  36 + return constructionCreditMapper.selectConstructionCreditById(id);
  37 + }
  38 +
  39 + /**
  40 + * 查询【请填写功能名称】列表
  41 + *
  42 + * @param constructionCredit 【请填写功能名称】
  43 + * @return 【请填写功能名称】
  44 + */
  45 + @Override
  46 + public List<ConstructionCredit> selectConstructionCreditList(ConstructionCredit constructionCredit)
  47 + {
  48 + return constructionCreditMapper.selectConstructionCreditList(constructionCredit);
  49 + }
  50 +
  51 + /**
  52 + * 新增【请填写功能名称】
  53 + *
  54 + * @param constructionCredit 【请填写功能名称】
  55 + * @return 结果
  56 + */
  57 + @Override
  58 + public int insertConstructionCredit(ConstructionCredit constructionCredit)
  59 + {
  60 +
  61 + constructionCredit.setTime(new Date());
  62 +
  63 + int i = constructionCreditMapper.insertConstructionCredit(constructionCredit);
  64 +
  65 + sentDataToRemoteServer(constructionCredit);
  66 +
  67 + return i;
  68 + }
  69 +
  70 + private void sentDataToRemoteServer(ConstructionCredit constructionCredit) {
  71 +
  72 + System.out.println("sendData!" + constructionCredit.getObjectId() + "status" + constructionCredit.getStatus() );
  73 +
  74 + }
  75 +
  76 + /**
  77 + * 修改【请填写功能名称】
  78 + *
  79 + * @param constructionCredit 【请填写功能名称】
  80 + * @return 结果
  81 + */
  82 + @Override
  83 + @Transactional
  84 + public int updateConstructionCredit(ConstructionCredit constructionCredit)
  85 + {
  86 +
  87 + ConstructionCredit cc = constructionCreditMapper.selectConstructionCreditById(constructionCredit.getId());
  88 +
  89 + cc.setStatus(1L);
  90 +
  91 + try {
  92 + constructionCreditMapper.updateConstructionCredit(cc);
  93 +
  94 + cc.setReason(constructionCredit.getReason());
  95 + cc.setLostCredit(0L);
  96 +
  97 + return insertConstructionCredit(cc);
  98 +
  99 + } catch (Exception e) {
  100 +
  101 + }
  102 +
  103 + return 0;
  104 + }
  105 +
  106 + /**
  107 + * 批量删除【请填写功能名称】
  108 + *
  109 + * @param ids 需要删除的【请填写功能名称】ID
  110 + * @return 结果
  111 + */
  112 + @Override
  113 + public int deleteConstructionCreditByIds(Long[] ids)
  114 + {
  115 + return constructionCreditMapper.deleteConstructionCreditByIds(ids);
  116 + }
  117 +
  118 + /**
  119 + * 删除【请填写功能名称】信息
  120 + *
  121 + * @param id 【请填写功能名称】ID
  122 + * @return 结果
  123 + */
  124 + @Override
  125 + public int deleteConstructionCreditById(Long id)
  126 + {
  127 + return constructionCreditMapper.deleteConstructionCreditById(id);
  128 + }
  129 +
  130 +
  131 +
  132 + public List<String> getNames(ConstructionCredit constructionCredit){
  133 + return constructionCreditMapper.getNames(constructionCredit);
  134 + }
  135 +}
trash-workFlow/src/main/java/com/trash/leave/controller/WorkflowController.java renamed to trash-workFlow/src/main/java/com/trash/workflow/controller/WorkflowController.java
  View file @346a825
1 -package com.trash.leave.controller; 1 +package com.trash.workflow.controller;
2 2
3 import java.util.Map; 3 import java.util.Map;
4 4
@@ -15,8 +15,8 @@ import com.trash.common.core.domain.entity.SysUser; @@ -15,8 +15,8 @@ import com.trash.common.core.domain.entity.SysUser;
15 import com.trash.common.core.domain.model.LoginUser; 15 import com.trash.common.core.domain.model.LoginUser;
16 import com.trash.common.utils.SecurityUtils; 16 import com.trash.common.utils.SecurityUtils;
17 import com.trash.framework.web.service.SysLoginService; 17 import com.trash.framework.web.service.SysLoginService;
18 -import com.trash.leave.service.IWorkflowService;  
19 import com.trash.system.service.ISysUserService; 18 import com.trash.system.service.ISysUserService;
  19 +import com.trash.workflow.service.IWorkflowService;
20 20
21 /** 21 /**
22 * 请假Controller 22 * 请假Controller
trash-workFlow/src/main/java/com/trash/leave/controller/WorkflowLeaveController.java renamed to trash-workFlow/src/main/java/com/trash/workflow/controller/WorkflowLeaveController.java
  View file @346a825
1 -package com.trash.leave.controller; 1 +package com.trash.workflow.controller;
2 2
3 import java.util.List; 3 import java.util.List;
4 4
@@ -15,8 +15,8 @@ import org.springframework.web.bind.annotation.RequestBody; @@ -15,8 +15,8 @@ import org.springframework.web.bind.annotation.RequestBody;
15 import org.springframework.web.bind.annotation.RequestMapping; 15 import org.springframework.web.bind.annotation.RequestMapping;
16 import org.springframework.web.bind.annotation.RestController; 16 import org.springframework.web.bind.annotation.RestController;
17 17
18 -import com.trash.leave.domain.WorkflowLeave;  
19 -import com.trash.leave.service.IWorkflowLeaveService; 18 +import com.trash.workflow.domain.WorkflowLeave;
  19 +import com.trash.workflow.service.IWorkflowLeaveService;
20 import com.trash.common.annotation.Log; 20 import com.trash.common.annotation.Log;
21 import com.trash.common.core.controller.BaseController; 21 import com.trash.common.core.controller.BaseController;
22 import com.trash.common.core.domain.AjaxResult; 22 import com.trash.common.core.domain.AjaxResult;
trash-workFlow/src/main/java/com/trash/leave/domain/Workflow.java renamed to trash-workFlow/src/main/java/com/trash/workflow/domain/Workflow.java
  View file @346a825
1 -package com.trash.leave.domain; 1 +package com.trash.workflow.domain;
2 2
3 import java.util.Date; 3 import java.util.Date;
4 import com.fasterxml.jackson.annotation.JsonFormat; 4 import com.fasterxml.jackson.annotation.JsonFormat;
trash-workFlow/src/main/java/com/trash/leave/domain/WorkflowLeave.java renamed to trash-workFlow/src/main/java/com/trash/workflow/domain/WorkflowLeave.java
  View file @346a825
1 -package com.trash.leave.domain; 1 +package com.trash.workflow.domain;
2 2
3 import java.util.Date; 3 import java.util.Date;
4 import com.fasterxml.jackson.annotation.JsonFormat; 4 import com.fasterxml.jackson.annotation.JsonFormat;
trash-workFlow/src/main/java/com/trash/leave/instener/EarthSitesEndStateListener.java renamed to trash-workFlow/src/main/java/com/trash/workflow/instener/EarthSitesEndStateListener.java
  View file @346a825
1 -package com.trash.leave.instener; 1 +package com.trash.workflow.instener;
2 2
3 -import com.trash.leave.domain.WorkflowLeave;  
4 -import com.trash.leave.service.IWorkflowLeaveService; 3 +import com.trash.workflow.domain.WorkflowLeave;
  4 +import com.trash.workflow.service.IWorkflowLeaveService;
5 import com.trash.common.utils.spring.SpringUtils; 5 import com.trash.common.utils.spring.SpringUtils;
6 6
7 import org.activiti.engine.delegate.DelegateExecution; 7 import org.activiti.engine.delegate.DelegateExecution;
trash-workFlow/src/main/java/com/trash/leave/instener/LeaveEndStateListener.java renamed to trash-workFlow/src/main/java/com/trash/workflow/instener/LeaveEndStateListener.java
  View file @346a825
1 -package com.trash.leave.instener; 1 +package com.trash.workflow.instener;
2 2
3 -import com.trash.leave.domain.WorkflowLeave;  
4 -import com.trash.leave.service.IWorkflowLeaveService; 3 +import com.trash.workflow.domain.WorkflowLeave;
  4 +import com.trash.workflow.service.IWorkflowLeaveService;
5 import com.trash.common.utils.spring.SpringUtils; 5 import com.trash.common.utils.spring.SpringUtils;
6 6
7 import org.activiti.engine.delegate.DelegateExecution; 7 import org.activiti.engine.delegate.DelegateExecution;
trash-workFlow/src/main/java/com/trash/leave/mapper/WorkflowLeaveMapper.java renamed to trash-workFlow/src/main/java/com/trash/workflow/mapper/WorkflowLeaveMapper.java
  View file @346a825
1 -package com.trash.leave.mapper; 1 +package com.trash.workflow.mapper;
2 2
3 import java.util.List; 3 import java.util.List;
4 4
5 import org.apache.ibatis.annotations.Param; 5 import org.apache.ibatis.annotations.Param;
6 6
7 -import com.trash.leave.domain.WorkflowLeave; 7 +import com.trash.workflow.domain.WorkflowLeave;
8 8
9 /** 9 /**
10 * 请假Mapper接口 10 * 请假Mapper接口
trash-workFlow/src/main/java/com/trash/leave/mapper/WorkflowMapper.java renamed to trash-workFlow/src/main/java/com/trash/workflow/mapper/WorkflowMapper.java
  View file @346a825
1 -package com.trash.leave.mapper; 1 +package com.trash.workflow.mapper;
2 2
3 import java.util.List; 3 import java.util.List;
4 4
5 import org.apache.ibatis.annotations.Param; 5 import org.apache.ibatis.annotations.Param;
6 6
7 -import com.trash.leave.domain.Workflow; 7 +import com.trash.workflow.domain.Workflow;
8 8
9 /** 9 /**
10 * 请假Mapper接口 10 * 请假Mapper接口
trash-workFlow/src/main/java/com/trash/leave/service/IWorkflowLeaveService.java renamed to trash-workFlow/src/main/java/com/trash/workflow/service/IWorkflowLeaveService.java
  View file @346a825
1 -package com.trash.leave.service; 1 +package com.trash.workflow.service;
2 2
3 import java.util.List; 3 import java.util.List;
4 import java.util.Map; 4 import java.util.Map;
5 5
6 -import com.trash.leave.domain.WorkflowLeave;  
7 import com.trash.activiti.domain.dto.HistoryDataDTO; 6 import com.trash.activiti.domain.dto.HistoryDataDTO;
  7 +import com.trash.workflow.domain.WorkflowLeave;
8 8
9 /** 9 /**
10 * 请假Service接口 10 * 请假Service接口
trash-workFlow/src/main/java/com/trash/leave/service/IWorkflowService.java renamed to trash-workFlow/src/main/java/com/trash/workflow/service/IWorkflowService.java
  View file @346a825
1 -package com.trash.leave.service; 1 +package com.trash.workflow.service;
2 2
3 import java.util.List; 3 import java.util.List;
4 import java.util.Map; 4 import java.util.Map;
5 5
6 -import com.trash.leave.domain.Workflow;  
7 import com.trash.activiti.domain.dto.HistoryDataDTO; 6 import com.trash.activiti.domain.dto.HistoryDataDTO;
  7 +import com.trash.workflow.domain.Workflow;
8 8
9 /** 9 /**
10 * 请假Service接口 10 * 请假Service接口
trash-workFlow/src/main/java/com/trash/leave/service/impl/WorkflowLeaveServiceImpl.java renamed to trash-workFlow/src/main/java/com/trash/workflow/service/impl/WorkflowLeaveServiceImpl.java
  View file @346a825
1 -package com.trash.leave.service.impl; 1 +package com.trash.workflow.service.impl;
2 2
3 import java.util.List; 3 import java.util.List;
4 4
5 import java.util.stream.Collectors; 5 import java.util.stream.Collectors;
6 6
7 -import com.trash.leave.domain.WorkflowLeave;  
8 -import com.trash.leave.mapper.WorkflowLeaveMapper;  
9 -import com.trash.leave.service.IWorkflowLeaveService;  
10 import com.trash.common.utils.DateUtils; 7 import com.trash.common.utils.DateUtils;
11 import com.trash.common.utils.SecurityUtils; 8 import com.trash.common.utils.SecurityUtils;
12 import com.trash.common.utils.StringUtils; 9 import com.trash.common.utils.StringUtils;
13 import com.trash.common.utils.uuid.UUID; 10 import com.trash.common.utils.uuid.UUID;
14 import com.trash.system.service.ISysUserService; 11 import com.trash.system.service.ISysUserService;
  12 +import com.trash.workflow.domain.WorkflowLeave;
  13 +import com.trash.workflow.mapper.WorkflowLeaveMapper;
  14 +import com.trash.workflow.service.IWorkflowLeaveService;
  15 +
15 import org.activiti.api.process.model.ProcessInstance; 16 import org.activiti.api.process.model.ProcessInstance;
16 import org.activiti.api.process.model.builders.ProcessPayloadBuilder; 17 import org.activiti.api.process.model.builders.ProcessPayloadBuilder;
17 import org.activiti.api.process.runtime.ProcessRuntime; 18 import org.activiti.api.process.runtime.ProcessRuntime;
trash-workFlow/src/main/java/com/trash/leave/service/impl/WorkflowServiceImpl.java renamed to trash-workFlow/src/main/java/com/trash/workflow/service/impl/WorkflowServiceImpl.java
  View file @346a825
1 -package com.trash.leave.service.impl; 1 +package com.trash.workflow.service.impl;
2 2
3 import java.util.List; 3 import java.util.List;
4 import java.util.Map; 4 import java.util.Map;
@@ -16,10 +16,10 @@ import com.trash.common.utils.DateUtils; @@ -16,10 +16,10 @@ import com.trash.common.utils.DateUtils;
16 import com.trash.common.utils.SecurityUtils; 16 import com.trash.common.utils.SecurityUtils;
17 import com.trash.common.utils.StringUtils; 17 import com.trash.common.utils.StringUtils;
18 import com.trash.common.utils.uuid.UUID; 18 import com.trash.common.utils.uuid.UUID;
19 -import com.trash.leave.domain.Workflow;  
20 -import com.trash.leave.mapper.WorkflowMapper;  
21 -import com.trash.leave.service.IWorkflowService;  
22 import com.trash.system.service.ISysUserService; 19 import com.trash.system.service.ISysUserService;
  20 +import com.trash.workflow.domain.Workflow;
  21 +import com.trash.workflow.mapper.WorkflowMapper;
  22 +import com.trash.workflow.service.IWorkflowService;
23 23
24 /** 24 /**
25 * 请假Service业务层处理 25 * 请假Service业务层处理
trash-workFlow/src/main/resources/mapper/ConstructionCreditMapper.xml 0 → 100644
  View file @346a825
  1 +<?xml version="1.0" encoding="UTF-8" ?>
  2 +<!DOCTYPE mapper
  3 +PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  4 +"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  5 +<mapper namespace="com.trash.business.mapper.ConstructionCreditMapper">
  6 +
  7 + <resultMap type="ConstructionCredit" id="ConstructionCreditResult">
  8 + <result property="id" column="id" />
  9 + <result property="name" column="name" />
  10 + <result property="type" column="type" />
  11 + <result property="time" column="time" />
  12 + <result property="place" column="place" />
  13 + <result property="reason" column="reason" />
  14 + <result property="status" column="status" />
  15 + <result property="lostCredit" column="lost_credit" />
  16 + <result property="objectId" column="object_id" />
  17 + </resultMap>
  18 +
  19 + <sql id="selectConstructionCreditVo">
  20 + select id, name, type, time, place, reason, status, lost_credit,object_id from construction_credit
  21 + </sql>
  22 +
  23 + <select id="selectConstructionCreditList" parameterType="ConstructionCredit" resultMap="ConstructionCreditResult">
  24 + <include refid="selectConstructionCreditVo"/>
  25 + <where>
  26 + <if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
  27 + <if test="type != null and type != ''"> and type = #{type}</if>
  28 + <if test="time != null "> and time = #{time}</if>
  29 + <if test="place != null and place != ''"> and place = #{place}</if>
  30 + <if test="reason != null and reason != ''"> and reason = #{reason}</if>
  31 + <if test="status != null "> and status = #{status}</if>
  32 + <if test="lostCredit != null "> and lost_credit = #{lostCredit}</if>
  33 + <if test="objectId != null "> and object_id = #{objectId}</if>
  34 + </where>
  35 + </select>
  36 +
  37 + <select id="selectConstructionCreditById" parameterType="Long" resultMap="ConstructionCreditResult">
  38 + <include refid="selectConstructionCreditVo"/>
  39 + where id = #{id}
  40 + </select>
  41 +
  42 + <insert id="insertConstructionCredit" parameterType="ConstructionCredit" useGeneratedKeys="true" keyProperty="id">
  43 + insert into construction_credit
  44 + <trim prefix="(" suffix=")" suffixOverrides=",">
  45 + <if test="name != null">name,</if>
  46 + <if test="type != null">type,</if>
  47 + <if test="time != null">time,</if>
  48 + <if test="place != null">place,</if>
  49 + <if test="reason != null">reason,</if>
  50 + <if test="status != null">status,</if>
  51 + <if test="lostCredit != null">lost_credit,</if>
  52 + <if test="objectId != null ">object_id,</if>
  53 + </trim>
  54 + <trim prefix="values (" suffix=")" suffixOverrides=",">
  55 + <if test="name != null">#{name},</if>
  56 + <if test="type != null">#{type},</if>
  57 + <if test="time != null">#{time},</if>
  58 + <if test="place != null">#{place},</if>
  59 + <if test="reason != null">#{reason},</if>
  60 + <if test="status != null">#{status},</if>
  61 + <if test="lostCredit != null">#{lostCredit},</if>
  62 + <if test="objectId != null ">#{objectId},</if>
  63 + </trim>
  64 + </insert>
  65 +
  66 + <update id="updateConstructionCredit" parameterType="ConstructionCredit">
  67 + update construction_credit
  68 + <trim prefix="SET" suffixOverrides=",">
  69 + <if test="name != null">name = #{name},</if>
  70 + <if test="type != null">type = #{type},</if>
  71 + <if test="time != null">time = #{time},</if>
  72 + <if test="place != null">place = #{place},</if>
  73 + <if test="reason != null">reason = #{reason},</if>
  74 + <if test="status != null">status = #{status},</if>
  75 + <if test="lostCredit != null">lost_credit = #{lostCredit},</if>
  76 + <if test="objectId != null ">object_id = #{objectId}</if>
  77 + </trim>
  78 + where id = #{id}
  79 + </update>
  80 +
  81 + <delete id="deleteConstructionCreditById" parameterType="Long">
  82 + delete from construction_credit where id = #{id}
  83 + </delete>
  84 +
  85 + <delete id="deleteConstructionCreditByIds" parameterType="String">
  86 + delete from construction_credit where id in
  87 + <foreach item="id" collection="array" open="(" separator="," close=")">
  88 + #{id}
  89 + </foreach>
  90 + </delete>
  91 +
  92 + <select id="getNames" parameterType="ConstructionCredit" resultType="String">
  93 +
  94 + select name from construction_credit
  95 + <where>
  96 + <if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
  97 + <if test="status != null "> and status = #{status}</if>
  98 + <if test="lostCredit != null "> and lost_credit = #{lostCredit}</if>
  99 + </where>
  100 + GROUP BY name
  101 + </select>
  102 +
  103 +
  104 +</mapper>
0 \ No newline at end of file 105 \ No newline at end of file
trash-workFlow/src/main/resources/mapper/leave/WorkflowLeaveMapper.xml renamed to trash-workFlow/src/main/resources/mapper/WorkflowLeaveMapper.xml
  View file @346a825
trash-workFlow/src/main/resources/mapper/leave/WorkflowMapper.xml renamed to trash-workFlow/src/main/resources/mapper/WorkflowMapper.xml
  View file @346a825