非现场报送

zrch-risk-server-39/jeecg-module-system/jeecg-module-stm/src/main/java/org/jeecg/modules/stm/baosong/controller/BaosongTaskController.java

@@ -202,7 +202,7 @@ public class BaosongTaskController extends JeecgController<BaosongTask, IBaosong
 			view.setTaskname(task.getName());
 			view.setTplid(tpl.getId());
 			view.setTplname(tpl.getCode()+"-"+ tpl.getNm());
-			view.setAppSta(1);
+			view.setAppSta(0);
 			saveList.add(view);
 		}
 		baosongTaskReviewService.saveBatch(saveList);

zrch-risk-server-39/jeecg-module-system/jeecg-module-stm/src/main/java/org/jeecg/modules/stm/baosong/controller/BaosongTaskReviewController.java

@@ -84,7 +84,9 @@ public class BaosongTaskReviewController extends JeecgController<BaosongTaskRevi
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
+
 		QueryWrapper<BaosongTaskReview> queryWrapper = QueryGenerator.initQueryWrapper(baosongTaskReview, req.getParameterMap());
+		queryWrapper.ne("app_sta",9);
 		Page<BaosongTaskReview> page = new Page<BaosongTaskReview>(pageNo, pageSize);
 		IPage<BaosongTaskReview> pageList = baosongTaskReviewService.page(page, queryWrapper);
 		return Result.OK(pageList);
@@ -116,12 +118,16 @@ public class BaosongTaskReviewController extends JeecgController<BaosongTaskRevi
 	public Result<String> edit(@RequestBody BaosongTaskReview baosongTaskReview) {
 		baosongTaskReview.setAppTime(new Date());
 		baosongTaskReviewService.updateById(baosongTaskReview);
-		if(baosongTaskReview.getAppSta()==0){
+		if(baosongTaskReview.getAppSta()==2){
 			baosongTaskService.updateTaskSta(1,baosongTaskReview.getTaskid());
+		} else if(baosongTaskReview.getAppSta()==1){
+			baosongTaskService.updateTaskSta(5,baosongTaskReview.getTaskid());
+		} else if(baosongTaskReview.getAppSta()==9){
+			baosongTaskService.updateTaskSta(9,baosongTaskReview.getTaskid());
 		}
-		return Result.OK("编辑成功!");
+		return Result.OK("保存成功!");
 	}
-	
+
 	/**
 	 *   通过id删除
 	 *

zrch-risk-server-39/jeecg-module-system/jeecg-module-stm/src/main/java/org/jeecg/modules/stm/baosong/controller/CreateXmlFile.java

@@ -282,7 +282,7 @@ public class CreateXmlFile {
         try {
             String respDepart = this.baosongTask.getRespDepart() != null ?
                     this.baosongTask.getRespDepart() : "";
-            String enterDate = formatDate(this.baosongTask.getEnterDate(), DATE_FORMAT_PATTERN);
+            String enterDate = this.baosongTask.getEnterDate();//formatDate(this.baosongTask.getEnterDate(), DATE_FORMAT_PATTERN);
             String enterTel = this.baosongTask.getEnterTel() != null ?
                     this.baosongTask.getEnterTel() : "";
             String respUser = this.baosongTask.getRespUser() != null ?

zrch-risk-server-39/jeecg-module-system/jeecg-module-stm/src/main/java/org/jeecg/modules/stm/baosong/entity/BaosongTask.java

@@ -57,35 +57,30 @@ public class BaosongTask implements Serializable {
     private java.lang.String enterRole;
 	/**联系电话*/
 	@Excel(name = "联系电话", width = 15)
-
     private java.lang.String enterTel;
-	/**填报日期*/
-	@Excel(name = "填报日期", width = 15, format = "yyyy-MM-dd")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
 
-    private java.util.Date enterDate;
-	/**责任人*/
-	@Excel(name = "责任人", width = 15)
+    /**统计时段*/
+	//@Excel(name = "统计时段", width = 15, format = "yyyy-MM-dd")
+    private java.lang.String enterDate;
 
+    /**责任人*/
+	@Excel(name = "责任人", width = 15)
     @Dict(dictTable ="sys_user",dicText = "realname",dicCode = "id")
     private java.lang.String respUser;
 
     /**责任部门*/
     @Excel(name = "责任部门", width = 15)
-
     private java.lang.String respDepart;
-	/**开始日期*/
+
+    /**开始日期*/
 	@Excel(name = "开始日期", width = 15, format = "yyyy-MM-dd")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
-
     private java.util.Date startDate;
 	/**结束日期*/
 	@Excel(name = "结束日期", width = 15, format = "yyyy-MM-dd")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
-
     private java.util.Date endDate;
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")

zrch-risk-server-39/jeecg-module-system/jeecg-module-stm/src/main/java/org/jeecg/modules/stm/metric/controller/MetricReportApprovalController.java

@@ -43,6 +43,9 @@ public class MetricReportApprovalController extends JeecgController<MetricReport
 	public Result<String> batchSaveApproval(@RequestBody MetricReport metricReport, HttpServletRequest req) {
 		try {
 			List<Integer> ids = metricReport.getIds();
+			if(ids==null || ids.size()==0){
+				return Result.OK("保存成功!");
+			}
 			Integer appSta = metricReport.getAppSta();
 			boolean updated = metricReportService.lambdaUpdate()
 			.in(MetricReport::getId, ids)

zrch-risk-server-39/jeecg-module-system/jeecg-module-stm/src/main/java/org/jeecg/modules/stm/problem/controller/StProblemCheckController.java

@@ -69,6 +69,7 @@ public class StProblemCheckController extends JeecgController<StProblemCheck, IS
 			for(StProblemCheck stPlanMan:pageList.getRecords()){
 				String tableName = getTableNameByMyBatisPlus();
 				if(tableName!=null&&!tableName.equals("")){
+
 					//需要根据 tableName 反查DeployId
 //					String deployId=iSysDictService.queryDictTextByKeyOfformTableName(tableName);
 //					stPlanMan.setDeployId(deployId);