Browse Source

修复bug

main
masiyuan 3 months ago
parent
commit
48b64b3197
  1. 2
      zdxt-modules/zdxt-enforcement-nos/src/main/java/com/zdxt/enforcementnos/domain/NosLawEnforcementCommentMsg.java
  2. 2
      zdxt-modules/zdxt-enforcement-nos/src/main/java/com/zdxt/enforcementnos/domain/NosLawEnforcementTaskMsg.java
  3. 4
      zdxt-modules/zdxt-enforcement-nos/src/main/java/com/zdxt/enforcementnos/domain/vo/NosLawEnforcementCommentMsgPageVO.java
  4. 4
      zdxt-modules/zdxt-enforcement-nos/src/main/java/com/zdxt/enforcementnos/domain/vo/NosLawEnforcementTaskByCommentStatusPageVO.java
  5. 6
      zdxt-modules/zdxt-enforcement-nos/src/main/java/com/zdxt/enforcementnos/domain/vo/NosLawEnforcementTaskMsgPageVO.java
  6. 3
      zdxt-modules/zdxt-enforcement-nos/src/main/java/com/zdxt/enforcementnos/service/impl/NosLawEnforcementTaskMsgServiceImpl.java

2
zdxt-modules/zdxt-enforcement-nos/src/main/java/com/zdxt/enforcementnos/domain/NosLawEnforcementCommentMsg.java

@ -30,7 +30,7 @@ public class NosLawEnforcementCommentMsg extends BaseEntity {
private String taskId; private String taskId;
/** /**
* 任务类别1-行政检查2-材料备案3-材料验证4-待核实案件 * 任务类别1-行政检查2-材料备案3-材料验证4-待核实案件5-巡查
*/ */
private Integer taskType; private Integer taskType;

2
zdxt-modules/zdxt-enforcement-nos/src/main/java/com/zdxt/enforcementnos/domain/NosLawEnforcementTaskMsg.java

@ -30,7 +30,7 @@ public class NosLawEnforcementTaskMsg extends BaseEntity {
private String taskId; private String taskId;
/** /**
* 任务类别1-行政检查2-材料备案3-材料验证4-待核实案件 * 任务类别1-行政检查2-材料备案3-材料验证4-待核实案件5-巡查
*/ */
private Integer taskType; private Integer taskType;

4
zdxt-modules/zdxt-enforcement-nos/src/main/java/com/zdxt/enforcementnos/domain/vo/NosLawEnforcementCommentMsgPageVO.java

@ -27,9 +27,9 @@ public class NosLawEnforcementCommentMsgPageVO {
private String taskId; private String taskId;
/** /**
* 任务类别1-行政检查2-材料备案3-材料验证4-待核实案件 * 任务类别1-行政检查2-材料备案3-材料验证4-待核实案件5-巡查
*/ */
@Schema(description = "任务类别(1-行政检查、2-材料备案、3-材料验证、4-待核实案件)") @Schema(description = "任务类别(1-行政检查、2-材料备案、3-材料验证、4-待核实案件、5-巡查)")
private Integer taskType; private Integer taskType;
/** /**

4
zdxt-modules/zdxt-enforcement-nos/src/main/java/com/zdxt/enforcementnos/domain/vo/NosLawEnforcementTaskByCommentStatusPageVO.java

@ -21,9 +21,9 @@ public class NosLawEnforcementTaskByCommentStatusPageVO {
private String taskId; private String taskId;
/** /**
* 任务类别1-行政检查2-材料备案3-材料验证4-待核实案件 * 任务类别1-行政检查2-材料备案3-材料验证4-待核实案件5-巡查
*/ */
@Schema(description = "任务类别(1-行政检查、2-材料备案、3-材料验证、4-待核实案件)") @Schema(description = "任务类别(1-行政检查、2-材料备案、3-材料验证、4-待核实案件、5-巡查)")
private Integer taskType; private Integer taskType;
/** /**

6
zdxt-modules/zdxt-enforcement-nos/src/main/java/com/zdxt/enforcementnos/domain/vo/NosLawEnforcementTaskMsgPageVO.java

@ -24,6 +24,12 @@ public class NosLawEnforcementTaskMsgPageVO {
@Schema(description = "任务id") @Schema(description = "任务id")
private String taskId; private String taskId;
/**
* 任务类型id1-行政检查2-材料备案3-材料验证4-待核实案件5-巡查
*/
@Schema(description = "任务类型id(1-行政检查、2-材料备案、3-材料验证、4-待核实案件、5-巡查)")
private Integer taskType;
/** /**
* 消息标题 * 消息标题
*/ */

3
zdxt-modules/zdxt-enforcement-nos/src/main/java/com/zdxt/enforcementnos/service/impl/NosLawEnforcementTaskMsgServiceImpl.java

@ -71,8 +71,7 @@ public class NosLawEnforcementTaskMsgServiceImpl extends ServiceImpl<NosLawEnfor
LambdaQueryWrapper<NosLawEnforcementTaskMsg> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<NosLawEnforcementTaskMsg> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper queryWrapper
.eq(NosLawEnforcementTaskMsg::getId, msgId) .eq(NosLawEnforcementTaskMsg::getId, msgId)
.eq(NosLawEnforcementTaskMsg::getEnterpriseId, enterpriseId) .eq(NosLawEnforcementTaskMsg::getEnterpriseId, enterpriseId);
.eq(NosLawEnforcementTaskMsg::getCreateBy, userId);
NosLawEnforcementTaskMsg msg = this.getOne(queryWrapper); NosLawEnforcementTaskMsg msg = this.getOne(queryWrapper);
if(msg == null) { if(msg == null) {
throw new ServiceException("当前用户没有此消息"); throw new ServiceException("当前用户没有此消息");

Loading…
Cancel
Save