licq/heli-mes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

品质异常确认查询修改

Browse Source
This commit is contained in:
z 2025-07-14 08:09:25 +08:00
parent a86c03c7de
commit ab440ab911
4 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/bdgzsomthing/bdgzsomthingController.java
View File

@ -151,7 +151,7 @@ public class bdgzsomthingController {
BeanUtils.toBean(list, bdgzsomthingRespVO.class)); BeanUtils.toBean(list, bdgzsomthingRespVO.class));
} }
// @Scheduled(fixedRate = 10800000) @Scheduled(fixedRate = 10800000)
public void scheduledTask() { public void scheduledTask() {
bdgzsomthingService.selectds(); bdgzsomthingService.selectds();
} }
@ -159,16 +159,16 @@ public class bdgzsomthingController {
//@Scheduled(cron = "0 2 0 * * ?") //每天十天执行一次 //@Scheduled(cron = "0 2 0 * * ?") //每天十天执行一次
@PostConstruct @PostConstruct
public void init() { public void init() {
// selectHasPrice(); selectHasPrice();
// selectSafeStorageAndDeliverOneYear(); selectSafeStorageAndDeliverOneYear();
// bdgzsomthingService.selectds(); // bdgzsomthingService.selectds();
} }
// @Scheduled(cron = "0 0 2 * * ?") @Scheduled(cron = "0 0 2 * * ?")
public void selectHasPrice(){ public void selectHasPrice(){
bdgzsomthingService.selectHasPrice(); bdgzsomthingService.selectHasPrice();
} }
// @Scheduled(cron = "0 0 0 * * ?") @Scheduled(cron = "0 0 0 * * ?")
public void selectSafeStorageAndDeliverOneYear(){bdgzsomthingService.selectSafeStorageAndDeliverOneYear();} public void selectSafeStorageAndDeliverOneYear(){bdgzsomthingService.selectSafeStorageAndDeliverOneYear();}
@PostMapping("/getMessage") @PostMapping("/getMessage")
@Operation(summary = "小程序消息") @Operation(summary = "小程序消息")

6
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/unqualifiednotification/UnqualifiedNotificationMapper.java
View File

@ -139,9 +139,11 @@ public interface UnqualifiedNotificationMapper extends BaseMapperX<UnqualifiedNo
Long selectCountConfirmPageWx( @Param("queryType") Integer queryType, Long selectCountConfirmPageWx( @Param("queryType") Integer queryType,
@Param("offset") Integer offset, @Param("offset") Integer offset,
@Param("limit") Integer limit); @Param("limit") Integer limit,
@Param("userId") Integer userId);
List<UnqualifiedNotificationDO> selectConfirmPageWx( @Param("queryType") Integer queryType, List<UnqualifiedNotificationDO> selectConfirmPageWx( @Param("queryType") Integer queryType,
@Param("offset") Integer offset, @Param("offset") Integer offset,
@Param("limit") Integer limit); @Param("limit") Integer limit,
@Param("userId") Integer userId);
} }

13
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/unqualifiednotification/UnqualifiedNotificationServiceImpl.java
View File

@ -37,10 +37,7 @@ import javax.annotation.Resource;
import javax.validation.Valid; import javax.validation.Valid;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.Date; import java.util.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static com.chanko.yunxi.mes.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.chanko.yunxi.mes.framework.common.exception.util.ServiceExceptionUtil.exception;
@ -245,13 +242,13 @@ try {
@Override @Override
public PageResult<UnqualifiedNotificationDO> unqualifiedNotificationConfirmPageWx(UnqualifiedNotificationPageReqVO pageReqVO) { public PageResult<UnqualifiedNotificationDO> unqualifiedNotificationConfirmPageWx(UnqualifiedNotificationPageReqVO pageReqVO) {
PageResult<UnqualifiedNotificationDO> pageResult = new PageResult<>(); PageResult<UnqualifiedNotificationDO> pageResult = new PageResult<>();
Long total = unqualifiedNotificationMapper.selectCountConfirmPageWx(pageReqVO.getQueryType(), pageReqVO.getPageNum(), pageReqVO.getPageSize()); Long total = unqualifiedNotificationMapper.selectCountConfirmPageWx(pageReqVO.getQueryType(), pageReqVO.getPageNum(), pageReqVO.getPageSize(),Objects.requireNonNull(getLoginUser()).getId().intValue());
pageResult.setTotal(total); pageResult.setTotal(total);
if (total > 0L){ if (total > 0L){
pageResult.setTotalPages(total.intValue()/ pageReqVO.getPageSize()); pageResult.setTotalPages(total.intValue()/ pageReqVO.getPageSize());
} }
List<UnqualifiedNotificationDO> unqualifiedNotificationDOS = unqualifiedNotificationMapper.selectConfirmPageWx(pageReqVO.getQueryType(), pageReqVO.getPageNum(), pageReqVO.getPageSize()); List<UnqualifiedNotificationDO> unqualifiedNotificationDOS = unqualifiedNotificationMapper.selectConfirmPageWx(pageReqVO.getQueryType(), pageReqVO.getPageNum(), pageReqVO.getPageSize(),Objects.requireNonNull(getLoginUser()).getId().intValue());
pageResult.setList(unqualifiedNotificationDOS); pageResult.setList(unqualifiedNotificationDOS);
return pageResult; return pageResult;
} }
@ -288,6 +285,7 @@ try {
bgMasterLineDO.setAuditor(operateReqVO.getAuditor().intValue()); bgMasterLineDO.setAuditor(operateReqVO.getAuditor().intValue());
bgMasterLineDO.setAudit_time(LocalDateTime.now()); bgMasterLineDO.setAudit_time(LocalDateTime.now());
bgMasterLineDO.setAuditOpinion(operateReqVO.getAuditOpinion()); bgMasterLineDO.setAuditOpinion(operateReqVO.getAuditOpinion());
// bgMasterLineDO.setConStatus(2);
bgMasterLineMapper.updateById(bgMasterLineDO); bgMasterLineMapper.updateById(bgMasterLineDO);
}else { }else {
//终检 //终检
@ -296,6 +294,7 @@ try {
bgMasterLineDO.setAuditor(operateReqVO.getAuditor().intValue()); bgMasterLineDO.setAuditor(operateReqVO.getAuditor().intValue());
bgMasterLineDO.setAudit_time(LocalDateTime.now()); bgMasterLineDO.setAudit_time(LocalDateTime.now());
bgMasterLineDO.setAuditOpinion(operateReqVO.getAuditOpinion()); bgMasterLineDO.setAuditOpinion(operateReqVO.getAuditOpinion());
// bgMasterLineDO.setConStatus(2);
zjBgMasterLineMapper.updateById(bgMasterLineDO); zjBgMasterLineMapper.updateById(bgMasterLineDO);
} }
// if(operateReqVO.getActive().equals("AUDIT")){ // if(operateReqVO.getActive().equals("AUDIT")){
@ -353,7 +352,7 @@ try {
@Override @Override
public Long countWx1(UnqualifiedNotificationPageReqVO pageReqVO) { public Long countWx1(UnqualifiedNotificationPageReqVO pageReqVO) {
return unqualifiedNotificationMapper.selectCountConfirmPageWx(1, 5,5); return unqualifiedNotificationMapper.selectCountConfirmPageWx(1, 5,5, Objects.requireNonNull(getLoginUser()).getId().intValue());
} }
} }

4
mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/unqualifiednotification/UnqualifiedNotificationMapper.xml
View File

@ -246,6 +246,7 @@
AND pr1.deleted = 0 AND pr1.tenant_id = 2 and t.is_qua = 1 AND pr1.deleted = 0 AND pr1.tenant_id = 2 and t.is_qua = 1
AND t.notification_status =3 AND t.notification_status =3
AND t.audit_opinion = 2 AND t.audit_opinion = 2
AND t.bg_user = #{userId}
AND t.con_status = #{queryType} AND t.con_status = #{queryType}
UNION ALL UNION ALL
@ -264,6 +265,7 @@
WHERE zj.deleted = 0 AND zj.tenant_id = 2 AND g1.deleted = 0 AND g1.tenant_id = 2 and zj.is_qua = 1 WHERE zj.deleted = 0 AND zj.tenant_id = 2 AND g1.deleted = 0 AND g1.tenant_id = 2 and zj.is_qua = 1
AND zj.notification_status = 3 AND zj.notification_status = 3
AND zj.audit_opinion=2 AND zj.audit_opinion=2
AND zj.bg_user = #{userId}
AND zj.con_status = #{queryType} AND zj.con_status = #{queryType}
) gh ) gh
</select> </select>
@ -291,6 +293,7 @@
AND pr1.deleted = 0 AND pr1.tenant_id = 2 and t.is_qua = 1 AND pr1.deleted = 0 AND pr1.tenant_id = 2 and t.is_qua = 1
AND t.notification_status =3 AND t.notification_status =3
AND t.audit_opinion = 2 AND t.audit_opinion = 2
AND t.bg_user = #{userId}
AND t.con_status = #{queryType} AND t.con_status = #{queryType}
UNION ALL UNION ALL
@ -307,6 +310,7 @@
WHERE zj.deleted = 0 AND zj.tenant_id = 2 AND g1.deleted = 0 AND g1.tenant_id = 2 and zj.is_qua = 1 WHERE zj.deleted = 0 AND zj.tenant_id = 2 AND g1.deleted = 0 AND g1.tenant_id = 2 and zj.is_qua = 1
AND zj.notification_status = 3 AND zj.notification_status = 3
AND zj.audit_opinion=2 AND zj.audit_opinion=2
AND zj.bg_user = #{userId}
AND zj.con_status = #{queryType} AND zj.con_status = #{queryType}
) gh ) gh