bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

代码还原

This commit is contained in:
liang.chao 2024-01-22 17:42:47 +08:00
parent faf1b88628
commit c1f3d612e6
6 changed files with 14 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java
View File

@ -340,20 +340,6 @@ public class TmTaskServiceImpl implements TmTaskService {
List<LeaseApplyDetails> listLeaseDetails = new ArrayList<>();
for (LeaseApplyInfo leaseApplyInfo : leaseApplyInfoList) {
if (leaseApplyInfo != null) {
SysUser sysUser = SecurityUtils.getLoginUser().getSysUser();
//获取当前用户所属公司id
Long companyId = sysUser.getCompanyId();
//获取当前用户的角色
Set<String> 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> leaseApplyDetails = tmTaskMapper.getLeaseApplyDetails(leaseApplyInfo);
if (leaseApplyDetails != null && !leaseApplyDetails.isEmpty()) {

13
sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyMapper.xml
View File

@ -278,18 +278,7 @@
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
<if test="taskStatus == 107">
SET tt.task_status = #{taskStatus},bad.audit_num=bad.pre_num,bai.direct_audit_by=#{createBy},bai.status='5',bai.direct_audit_time=NOW()
</if>
<if test="taskStatus == 109">
SET tt.task_status = #{taskStatus},bad.audit_num=bad.pre_num,bai.direct_audit_by=#{createBy},bai.status='7',bai.direct_audit_time=NOW()
</if>
<if test="taskStatus == 103">
SET tt.task_status = #{taskStatus},bad.audit_num=bad.pre_num,bai.direct_audit_by=#{createBy},bai.status='1',bai.direct_audit_time=NOW()
</if>
<if test="taskStatus == 105">
SET tt.task_status = #{taskStatus},bad.audit_num=bad.pre_num,bai.direct_audit_by=#{createBy},bai.status='3',bai.direct_audit_time=NOW()
</if>
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}
</update>

48
sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
View File

@ -616,30 +616,6 @@
update_by = #{record.companyAuditBy},
update_time = now(),
</if>
<if test="record.examineStatusId == 103 and record.examineStatusId == '103'">
direct_audit_by = #{record.companyAuditBy},
direct_audit_time = now(),
direct_audit_remark = #{record.companyAuditRemark},
status = 1,
</if>
<if test="record.examineStatusId == 105 and record.examineStatusId == '105'">
direct_audit_by = #{record.companyAuditBy},
direct_audit_time = now(),
direct_audit_remark = #{record.companyAuditRemark},
status = 3,
</if>
<if test="record.examineStatusId == 107 and record.examineStatusId == '107'">
direct_audit_by = #{record.companyAuditBy},
direct_audit_time = now(),
direct_audit_remark = #{record.companyAuditRemark},
status = 5,
</if>
<if test="record.examineStatusId == 109 and record.examineStatusId == '109'">
direct_audit_by = #{record.companyAuditBy},
direct_audit_time = now(),
direct_audit_remark = #{record.companyAuditRemark},
status = 7,
</if>
</trim>
WHERE
task_id = #{record.taskId}
@ -665,30 +641,6 @@
direct_audit_time = now(),
direct_audit_remark = #{record.companyAuditRemark},
</if>
<if test="record.examineStatusId == 104 and record.examineStatusId == '104'">
direct_audit_by = #{record.companyAuditBy},
direct_audit_time = now(),
direct_audit_remark = #{record.companyAuditRemark},
status = 2,
</if>
<if test="record.examineStatusId == 106 and record.examineStatusId == '106'">
direct_audit_by = #{record.companyAuditBy},
direct_audit_time = now(),
direct_audit_remark = #{record.companyAuditRemark},
status = 4,
</if>
<if test="record.examineStatusId == 108 and record.examineStatusId == '108'">
direct_audit_by = #{record.companyAuditBy},
direct_audit_time = now(),
direct_audit_remark = #{record.companyAuditRemark},
status = 6,
</if>
<if test="record.examineStatusId == 110 and record.examineStatusId == '110'">
direct_audit_by = #{record.companyAuditBy},
direct_audit_time = now(),
direct_audit_remark = #{record.companyAuditRemark},
status = 8,
</if>
</trim>
WHERE
task_id = #{record.taskId}

21
sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml
View File

@ -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
<if test="taskStatus == 107">
SET tt.task_status = #{taskStatus},bad.audit_num=bad.pre_num,bai.direct_audit_by=#{createBy},bad.status='5',bai.direct_audit_time=NOW()
</if>
<if test="taskStatus == 109">
SET tt.task_status = #{taskStatus},bad.audit_num=bad.pre_num,bai.direct_audit_by=#{createBy},bad.status='7',bai.direct_audit_time=NOW()
</if>
<if test="taskStatus == 103">
SET tt.task_status = #{taskStatus},bad.audit_num=bad.pre_num,bai.direct_audit_by=#{createBy},bad.status='1',bai.direct_audit_time=NOW()
</if>
<if test="taskStatus == 105">
SET tt.task_status = #{taskStatus},bad.audit_num=bad.pre_num,bai.direct_audit_by=#{createBy},bad.status='3',bai.direct_audit_time=NOW()
</if>
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}
</update>
@ -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
<if test="taskStatus == 108">
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()
</if>
<if test="taskStatus == 110">
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()
</if>
<if test="taskStatus == 104">
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()
</if>
<if test="taskStatus == 106">
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()
</if>
WHERE
bai.id = #{id}

2
sgzb-ui/package.json
View File

@ -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",

7
sgzb-ui/vue.config.js
View File

@ -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: {