项目库-法规清单，增加清单、任务确认截止时间。

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java

@@ -67,8 +67,8 @@ public class ProjectLawsInventoryEOController extends JeroController<ProjectLaws
 	@AutoLog(value = "项目库-法规清单表-列表查询")
     @ApiOperation(value="项目库-法规清单表-列表查询", notes="项目库-法规清单表-列表查询")
 	@GetMapping(value = "/list")
-	public Result<List<ProjectLawsInventoryEO>> queryList(ProjectLawsInventoryEO projectLawsInventoryEO) {
+	public Result<List<ProjectLawsInventoryEO>> queryList(ProjectLawsInventoryEO projectLawsInventoryEO,HttpServletRequest req) {
-        List<ProjectLawsInventoryEO> list = projectLawsInventoryEOService.queryList(projectLawsInventoryEO);
+        List<ProjectLawsInventoryEO> list = projectLawsInventoryEOService.queryList(projectLawsInventoryEO,req);
         return Result.OK(list);
 	}
 

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java

@@ -285,4 +285,18 @@ public class ProjectLawsInventoryEO implements Serializable {
     @TableField(exist = false)
     @ApiModelProperty(value = "文档库id")
     private String ids;//文档库id  多个之间用英文逗号拼接
+
+    /**清单确认-截止时间*/
+    @Excel(name = "清单确认-截止时间", width = 15, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "清单确认-截止时间")
+    private Date inventoryAffirmDueDate;
+
+    /**任务确认-截止时间*/
+    @Excel(name = "任务确认-截止时间", width = 15, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "任务确认-截止时间")
+    private Date taskAffirmDueDate;
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java

@@ -3,6 +3,8 @@ package com.jero.modules.project.service;
 import com.jero.common.api.vo.Result;
 import com.jero.modules.project.entity.ProjectLawsInventoryEO;
 import com.baomidou.mybatisplus.extension.service.IService;
+
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.Map;
 
@@ -59,7 +61,7 @@ public interface IProjectLawsInventoryEOService extends IService<ProjectLawsInve
 	 *
 	 * @return
 	 */
-    List<ProjectLawsInventoryEO> queryList(ProjectLawsInventoryEO projectLawsInventoryEO);
+    List<ProjectLawsInventoryEO> queryList(ProjectLawsInventoryEO projectLawsInventoryEO, HttpServletRequest req);
 
 	/**
 	 * 批量更新状态

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.jero.common.api.vo.Result;
 import com.jero.common.exception.JeroBootException;
+import com.jero.common.system.query.QueryGenerator;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.modules.document.entity.BussDocumentLibraryEO;
 import com.jero.modules.document.service.IBussDocumentLibraryEOService;
@@ -27,6 +28,8 @@ import java.util.stream.Collectors;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * @Description: 项目库-法规清单表
  * @Author: jero-boot
@@ -135,7 +138,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 	 * @return
 	 */
 	@Override
-    public List<ProjectLawsInventoryEO> queryList(ProjectLawsInventoryEO projectLawsInventoryEO) {
+    public List<ProjectLawsInventoryEO> queryList(ProjectLawsInventoryEO projectLawsInventoryEO, HttpServletRequest req) {
+		QueryWrapper<ProjectLawsInventoryEO> projectLawsInventoryEOQueryWrapper = QueryGenerator.initQueryWrapper(projectLawsInventoryEO,req.getParameterMap());
 		String projectLibraryId = projectLawsInventoryEO.getProjectLibraryId();
 
 		if(StringUtils.isEmpty(projectLibraryId)){
@@ -144,7 +148,6 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 
-		QueryWrapper<ProjectLawsInventoryEO> projectLawsInventoryEOQueryWrapper = new QueryWrapper<>();
 		projectLawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectLibraryId);
 
 		//验证当前用户在该项目中是什么角色
@@ -340,6 +343,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		try {
 			//TODO 切换成枚举，不要在代码里出现魔数
 			if(StringUtils.equals(operatorType, OperatorTypeEnum.INVENTORY_AFFIRM.getValue())){
+				//清单确认截止时间
+				Date inventoryAffirmDueDate = (Date) params.get("inventoryAffirmDueDate");
+
 				QueryWrapper<ProjectLawsInventoryEO> queryWrapper = new QueryWrapper<>();
 				if(StringUtils.isNotEmpty(ids)){
 					queryWrapper.lambda().in(ProjectLawsInventoryEO::getId, Arrays.asList(ids.split(",")));
@@ -359,7 +365,10 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 						projectLawsInventoryEO.setInventoryAffirmStatus(InventoryAffirmStatusEnum.LIST_TO_CONFIRM.getValue());
 						projectLawsInventoryEO.setRegulationOwnerSubmitStatus(null);
 						projectLawsInventoryEO.setHomologationEngineerSubmitStatus(null);
+						projectLawsInventoryEO.setInventoryAffirmDueDate(inventoryAffirmDueDate);
 						super.updateById(projectLawsInventoryEO);
+						//发送消息
+						String sendMessage = "XXX" + "发起了" + " XXX " + "（项目名称）法规的清单确认，截止时间为：" +inventoryAffirmDueDate+ "， 请及时查看处理。";
 					}
 				}
 				result = "发起清单确认";