diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java index e71bf8a5..0cc16df3 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java @@ -340,20 +340,6 @@ public class TmTaskServiceImpl implements TmTaskService { List listLeaseDetails = new ArrayList<>(); for (LeaseApplyInfo leaseApplyInfo : leaseApplyInfoList) { if (leaseApplyInfo != null) { - SysUser sysUser = SecurityUtils.getLoginUser().getSysUser(); - //获取当前用户所属公司id - Long companyId = sysUser.getCompanyId(); - //获取当前用户的角色 - Set roles = SecurityUtils.getLoginUser().getRoles(); - StringBuilder sb = new StringBuilder(); - for (String s : roles) { - sb.append(s); - } - String rolesStr = sb.toString(); - //如果是内部人员，加上所属公司 - if (rolesStr.contains("nbry") && !rolesStr.contains("admin")) { - leaseApplyInfo.setCompanyId(Integer.parseInt(companyId.toString())); - } // 去查询领料任务详情表 List leaseApplyDetails = tmTaskMapper.getLeaseApplyDetails(leaseApplyInfo); if (leaseApplyDetails != null && !leaseApplyDetails.isEmpty()) { diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyMapper.xml index 04f5607e..c8779fa7 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyMapper.xml @@ -276,22 +276,11 @@ UPDATE tm_task tt - LEFT JOIN back_apply_info bai ON bai.task_id = tt.task_id - LEFT JOIN back_apply_details bad on bad.parent_id=bai.id - - SET tt.task_status = #{taskStatus},bad.audit_num=bad.pre_num,bai.direct_audit_by=#{createBy},bai.status='5',bai.direct_audit_time=NOW() - - - SET tt.task_status = #{taskStatus},bad.audit_num=bad.pre_num,bai.direct_audit_by=#{createBy},bai.status='7',bai.direct_audit_time=NOW() - - - SET tt.task_status = #{taskStatus},bad.audit_num=bad.pre_num,bai.direct_audit_by=#{createBy},bai.status='1',bai.direct_audit_time=NOW() - - - SET tt.task_status = #{taskStatus},bad.audit_num=bad.pre_num,bai.direct_audit_by=#{createBy},bai.status='3',bai.direct_audit_time=NOW() - + LEFT JOIN back_apply_info bai ON bai.task_id = tt.task_id + LEFT JOIN back_apply_details bad on bad.parent_id=bai.id + SET tt.task_status = '38',bad.audit_num=bad.pre_num,bai.direct_audit_by=#{createBy},bai.direct_audit_time=NOW() WHERE - bai.id = #{id} + bai.id = #{id} diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml index e746f958..fbcd3d9e 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml @@ -616,30 +616,6 @@ update_by = #{record.companyAuditBy}, update_time = now(), - - direct_audit_by = #{record.companyAuditBy}, - direct_audit_time = now(), - direct_audit_remark = #{record.companyAuditRemark}, - status = 1, - - - direct_audit_by = #{record.companyAuditBy}, - direct_audit_time = now(), - direct_audit_remark = #{record.companyAuditRemark}, - status = 3, - - - direct_audit_by = #{record.companyAuditBy}, - direct_audit_time = now(), - direct_audit_remark = #{record.companyAuditRemark}, - status = 5, - - - direct_audit_by = #{record.companyAuditBy}, - direct_audit_time = now(), - direct_audit_remark = #{record.companyAuditRemark}, - status = 7, - WHERE task_id = #{record.taskId} @@ -665,30 +641,6 @@ direct_audit_time = now(), direct_audit_remark = #{record.companyAuditRemark}, - - direct_audit_by = #{record.companyAuditBy}, - direct_audit_time = now(), - direct_audit_remark = #{record.companyAuditRemark}, - status = 2, - - - direct_audit_by = #{record.companyAuditBy}, - direct_audit_time = now(), - direct_audit_remark = #{record.companyAuditRemark}, - status = 4, - - - direct_audit_by = #{record.companyAuditBy}, - direct_audit_time = now(), - direct_audit_remark = #{record.companyAuditRemark}, - status = 6, - - - direct_audit_by = #{record.companyAuditBy}, - direct_audit_time = now(), - direct_audit_remark = #{record.companyAuditRemark}, - status = 8, - WHERE task_id = #{record.taskId} diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml index 45069262..3bee2718 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml @@ -253,18 +253,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" UPDATE tm_task tt LEFT JOIN back_apply_info bai ON bai.task_id = tt.task_id LEFT JOIN back_apply_details bad on bad.parent_id=bai.id - - SET tt.task_status = #{taskStatus},bad.audit_num=bad.pre_num,bai.direct_audit_by=#{createBy},bad.status='5',bai.direct_audit_time=NOW() - - - SET tt.task_status = #{taskStatus},bad.audit_num=bad.pre_num,bai.direct_audit_by=#{createBy},bad.status='7',bai.direct_audit_time=NOW() - - - SET tt.task_status = #{taskStatus},bad.audit_num=bad.pre_num,bai.direct_audit_by=#{createBy},bad.status='1',bai.direct_audit_time=NOW() - - - SET tt.task_status = #{taskStatus},bad.audit_num=bad.pre_num,bai.direct_audit_by=#{createBy},bad.status='3',bai.direct_audit_time=NOW() - + SET tt.task_status = '38',bad.audit_num=bad.pre_num,bai.direct_audit_by=#{createBy},bad.status='1',bai.direct_audit_time=NOW() WHERE bai.id = #{id} @@ -274,16 +263,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN back_apply_info bai ON bai.task_id = tt.task_id LEFT JOIN back_apply_details bad on bad.parent_id=bai.id - SET tt.task_status = #{taskStatus},bad.audit_num=bad.pre_num,bai.direct_audit_by=#{createBy},bad.status='6',bai.direct_audit_time=NOW() + SET tt.task_status = #{taskStatus},bad.audit_num=bad.pre_num,bai.direct_audit_by=#{createBy},bai.status='6',bai.direct_audit_time=NOW() - SET tt.task_status = #{taskStatus},bad.audit_num=bad.pre_num,bai.direct_audit_by=#{createBy},bad.status='8',bai.direct_audit_time=NOW() + SET tt.task_status = #{taskStatus},bad.audit_num=bad.pre_num,bai.direct_audit_by=#{createBy},bai.status='8',bai.direct_audit_time=NOW() - SET tt.task_status = #{taskStatus},bad.audit_num=bad.pre_num,bai.direct_audit_by=#{createBy},bad.status='2',bai.direct_audit_time=NOW() + SET tt.task_status = #{taskStatus},bad.audit_num=bad.pre_num,bai.direct_audit_by=#{createBy},bai.status='2',bai.direct_audit_time=NOW() - SET tt.task_status = #{taskStatus},bad.audit_num=bad.pre_num,bai.direct_audit_by=#{createBy},bad.status='4',bai.direct_audit_time=NOW() + SET tt.task_status = #{taskStatus},bad.audit_num=bad.pre_num,bai.direct_audit_by=#{createBy},bai.status='4',bai.direct_audit_time=NOW() WHERE bai.id = #{id} diff --git a/sgzb-ui/package.json b/sgzb-ui/package.json index 983fed2a..680f403b 100644 --- a/sgzb-ui/package.json +++ b/sgzb-ui/package.json @@ -5,7 +5,7 @@ "author": "机具", "license": "MIT", "scripts": { - "dev": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve", + "dev": "vue-cli-service serve", "build": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build", "build:stage": "vue-cli-service build --mode staging", "preview": "node build/index.js --preview", diff --git a/sgzb-ui/vue.config.js b/sgzb-ui/vue.config.js index eb1d2f88..fd27ee04 100644 --- a/sgzb-ui/vue.config.js +++ b/sgzb-ui/vue.config.js @@ -37,13 +37,14 @@ module.exports = { [process.env.VUE_APP_BASE_API]: { // target: `http://112.29.103.165:21626`,//线上环境-重庆 // target: `http://112.29.103.165:21624`,//线上环境-宁夏 - target: `http://192.168.0.14:21624`,//线上环境 - // target: `http://192.168.5.21:8080`,// + // target: `http://192.168.0.14:21624`,//线上环境 + // target: `http://192.168.5.12:8080`,//丁 // target: `http://10.40.92.21:8080`, - // target: `http://10.40.92.13:8080`, + // target: `http://10.40.92.126:8080`,//高 // target: `http://10.40.92.104:8080`,//亮 // target: `http://192.168.0.166:8080`,//刘川 + target: `http://10.40.92.21:8080`,//梁超 changeOrigin: true, pathRewrite: {