sxyanzhu
/
jhprjv2
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

dev_xds
姜玉琦 2023-09-24 16:35:45 +08:00
parent 89fc3a7891
commit a9467e2ad0
6 changed files with 58 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAuditinfoServiceImpl.java
View File

@ -194,14 +194,25 @@ public class SurProjectAuditinfoServiceImpl implements ISurProjectAuditinfoServi
List<SurProjectMeasure> surProjectMeasureList = surProjectMeasureMapper.selectSurProjectMeasureList(new SurProjectMeasure());
if(surProjectCheckDetectionList!=null && surProjectCheckDetectionList.size()>0){
for(SurProjectCheckDetection surProjectCheckDetection:surProjectCheckDetectionList){
SurProjectAuditinfo a = new SurProjectAuditinfo();
a.setFromType(PublicStateEnum.AUDIT_TYPE_QYFS.getCode());
a.setFromId(surProjectCheckDetection.getId());
a.setApproveStatus("1");
a.setComment("提交申请");
a.setCreateBy(surProjectCheckDetection.getCreateBy());
a.setCreateTime(surProjectCheckDetection.getCreateTime());
list.add(a);
if("2".equals(surProjectCheckDetection.getCheckState())){
SurProjectAuditinfo a = new SurProjectAuditinfo();
a.setFromType(PublicStateEnum.AUDIT_TYPE_QYFS.getCode());
a.setFromId(surProjectCheckDetection.getId());
a.setApproveStatus("1");
a.setComment("提交申请");
a.setCreateBy(surProjectCheckDetection.getCreateBy());
a.setCreateTime(surProjectCheckDetection.getCreateTime());
list.add(a);
SurProjectAuditinfo b = new SurProjectAuditinfo();
b.setFromType(PublicStateEnum.AUDIT_TYPE_QYFS.getCode());
b.setFromId(surProjectCheckDetection.getId());
b.setApproveStatus("4");
b.setComment("默认审核通过");
b.setCreateBy(surProjectCheckDetection.getWitnessUser());
b.setCreateTime(surProjectCheckDetection.getCreateTime());
list.add(b);
}
}
}
@ -215,6 +226,15 @@ public class SurProjectAuditinfoServiceImpl implements ISurProjectAuditinfoServi
a.setCreateBy(surProjectChecking.getCreateBy());
a.setCreateTime(surProjectChecking.getCreateTime());
list.add(a);
SurProjectAuditinfo b = new SurProjectAuditinfo();
b.setFromType(PublicStateEnum.AUDIT_TYPE_JPYS.getCode());
b.setFromId(surProjectChecking.getId());
b.setApproveStatus("4");
b.setComment("默认审核通过");
b.setCreateBy(surProjectChecking.getSuperviseUser());
b.setCreateTime(surProjectChecking.getCreateTime());
list.add(b);
}
}
@ -228,6 +248,15 @@ public class SurProjectAuditinfoServiceImpl implements ISurProjectAuditinfoServi
a.setCreateBy(surProjectMaterialSeal.getCreateBy());
a.setCreateTime(surProjectMaterialSeal.getCreateTime());
list.add(a);
SurProjectAuditinfo b = new SurProjectAuditinfo();
b.setFromType(PublicStateEnum.AUDIT_TYPE_CLFY.getCode());
b.setFromId(surProjectMaterialSeal.getId());
b.setApproveStatus("4");
b.setComment("默认审核通过");
b.setCreateBy(surProjectMaterialSeal.getWitnessUser());
b.setCreateTime(surProjectMaterialSeal.getCreateTime());
list.add(b);
}
}
@ -241,6 +270,15 @@ public class SurProjectAuditinfoServiceImpl implements ISurProjectAuditinfoServi
a.setCreateBy(surProjectMeasure.getCreateBy());
a.setCreateTime(surProjectMeasure.getCreateTime());
list.add(a);
SurProjectAuditinfo b = new SurProjectAuditinfo();
b.setFromType(PublicStateEnum.AUDIT_TYPE_SCSL.getCode());
b.setFromId(surProjectMeasure.getId());
b.setApproveStatus("4");
b.setComment("默认审核通过");
b.setCreateBy(surProjectMeasure.getSuperviseUser());
b.setCreateTime(surProjectMeasure.getCreateTime());
list.add(b);
}
}
surProjectAuditinfoMapper.batch(list);

6
yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCheckDetectionServiceImpl.java
View File

@ -99,13 +99,15 @@ public class SurProjectCheckDetectionServiceImpl implements ISurProjectCheckDete
surProjectAuditinfo.setCreateBy(surProjectCheckDetection.getUpdateBy());
surProjectAuditinfo.setCreateTime(new Date());
surProjectAuditinfoMapper.insertSurProjectAuditinfo(surProjectAuditinfo);
}else{
}
//修改人和修改时间为登记检测结果信息，审批合格或不合格时不修改这个字段
if(PublicStateEnum.AUDITINFO_DSH.getCode().equals(surProjectCheckDetection.getApproveStatus())){
// 非提交时保存最后修改人
if(surProjectCheckDetection.getUpdateBy()==null){
surProjectCheckDetection.setUpdateBy(SecurityUtils.getUsername());
}
surProjectCheckDetection.setUpdateTime(DateUtils.getNowDate());
surProjectCheckDetection.setUpdateTime(new Date());
}
return surProjectCheckDetectionMapper.updateSurProjectCheckDetection(surProjectCheckDetection);

3
yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCheckingServiceImpl.java
View File

@ -141,6 +141,7 @@ public class SurProjectCheckingServiceImpl implements ISurProjectCheckingService
surProjectChecking.setIsDel(Convert.toLong(PublicStateEnum.OK.getCode()));
surProjectChecking.setCreateTime(DateUtils.getNowDate());
int res = surProjectCheckingMapper.insertSurProjectChecking(surProjectChecking);
//操作日志
if(StringUtils.isNotBlank(surProjectChecking.getApproveStatus())){
SurProjectAuditinfo surProjectAuditinfo = new SurProjectAuditinfo();
@ -155,7 +156,7 @@ public class SurProjectCheckingServiceImpl implements ISurProjectCheckingService
surProjectAuditinfoMapper.insertSurProjectAuditinfo(surProjectAuditinfo);
}
return surProjectCheckingMapper.insertSurProjectChecking(surProjectChecking);
return res;
}
/**

3
yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectMaterialSealServiceImpl.java
View File

@ -101,6 +101,7 @@ public class SurProjectMaterialSealServiceImpl implements ISurProjectMaterialSea
surProjectMaterialSeal.setMainImage(surProjectMaterialSeal.getImageUrls().split(",")[0]);
surProjectMaterialSeal.setCreateTime(DateUtils.getNowDate());
int res = surProjectMaterialSealMapper.insertSurProjectMaterialSeal(surProjectMaterialSeal);
//操作日志
if(StringUtils.isNotBlank(surProjectMaterialSeal.getApproveStatus())){
SurProjectAuditinfo surProjectAuditinfo = new SurProjectAuditinfo();
@ -115,7 +116,7 @@ public class SurProjectMaterialSealServiceImpl implements ISurProjectMaterialSea
surProjectAuditinfoMapper.insertSurProjectAuditinfo(surProjectAuditinfo);
}
return surProjectMaterialSealMapper.insertSurProjectMaterialSeal(surProjectMaterialSeal);
return res;
}
/**

5
yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectMeasureServiceImpl.java
View File

@ -100,6 +100,7 @@ public class SurProjectMeasureServiceImpl implements ISurProjectMeasureService
surProjectMeasure.setIsDel(PublicStateEnum.OK.getCode());
surProjectMeasure.setCreateTime(DateUtils.getNowDate());
int res = surProjectMeasureMapper.insertSurProjectMeasure(surProjectMeasure);
//操作日志
if(StringUtils.isNotBlank(surProjectMeasure.getApproveStatus())){
SurProjectAuditinfo surProjectAuditinfo = new SurProjectAuditinfo();
@ -114,7 +115,7 @@ public class SurProjectMeasureServiceImpl implements ISurProjectMeasureService
surProjectAuditinfoMapper.insertSurProjectAuditinfo(surProjectAuditinfo);
}
return surProjectMeasureMapper.insertSurProjectMeasure(surProjectMeasure);
return res;
}
/**
@ -127,7 +128,7 @@ public class SurProjectMeasureServiceImpl implements ISurProjectMeasureService
@Transactional
public int updateSurProjectMeasure(SurProjectMeasure surProjectMeasure)
{
if(surProjectMeasure.getCreateBy()==null){
if(surProjectMeasure.getUpdateBy()==null){
surProjectMeasure.setUpdateBy(SecurityUtils.getUsername());
}
if(surProjectMeasure.getImageUrls()!=null){

2
yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckDetectionMapper.xml
View File

@ -77,7 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test='nowRole == "5" or nowRole == "6" or nowRole == "7"'> and (spui.unitId = #{nowDept} or spcd.witness_user=#{nowUserName})</if>
<!--普通用户查询项目人员-->
<if test='nowRole == "15" or nowRole == "16" or nowRole == "17" or nowRole == "99"'> and spu.is_del=0 and (spu.user_id = #{nowUser} or spcd.witness_user=#{nowUserName})</if>
<if test='activeName == "jxz"'> and spcd.approve_status != '4'</if>
<if test='activeName == "jxz"'> and (spcd.approve_status != '4' or spcd.approve_status is null)</if>
<if test='activeName == "ywc"'> and spcd.approve_status = '4'</if>
</where>
order by spcd.check_time desc