Merge remote-tracking branch 'origin/master'

dangan-dangan/src/main/java/com/da/dangan/controller/DaBirthDjController.java

@@ -9,9 +9,7 @@ import com.da.common.core.page.TableDataInfo;
 import com.da.common.enums.BusinessType;
 import com.da.common.utils.poi.ExcelUtil;
 import com.da.dangan.domain.DaBirthDj;
-import com.da.dangan.domain.DaPicturesRecard;
 import com.da.dangan.service.IDaBirthDjService;
-import com.da.dangan.service.IDaPicturesRecardService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -31,8 +29,6 @@ public class DaBirthDjController extends BaseController
 {
     @Autowired
     private IDaBirthDjService daBirthDjService;
-    @Autowired
-    private IDaPicturesRecardService daPicturesRecardService;
     /**
      * 查询出生登记列表
      */
@@ -75,16 +71,6 @@ public class DaBirthDjController extends BaseController
         return success(daBirthDjService.selectDaBirthDjById(id));
     }
 
-    /**
-     * 新增出生登记
-     */
-    /*@PreAuthorize("@ss.hasPermi('dangan:birthDJ:add')")
-    @Log(title = "出生登记", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody DaBirthDj daBirthDj)
-    {
-        return toAjax(daBirthDjService.insertDaBirthDj(daBirthDj));
-    }*/
     /**
      * 新增出生登记
      */
@@ -93,15 +79,7 @@ public class DaBirthDjController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody DaBirthDj daBirthDj)
     {
-        String[] picIds = daBirthDj.getPicIds().split(",");
+        daBirthDj.setCreateBy(getUsername());
-        if(picIds!=null&&picIds.length>0){
-            for(String picid:picIds){
-                DaPicturesRecard picRecard = new DaPicturesRecard();
-                picRecard.setId(Long.parseLong(picid));
-                picRecard.setRecognize("1");
-                daPicturesRecardService.updateDaPicturesRecard(picRecard);
-            }
-        }
         return toAjax(daBirthDjService.insertDaBirthDj(daBirthDj));
     }
 

dangan-dangan/src/main/java/com/da/dangan/controller/DaCzrkdjController.java

@@ -10,13 +10,11 @@ import com.da.common.core.page.TableDataInfo;
 import com.da.common.enums.BusinessType;
 import com.da.common.utils.poi.ExcelUtil;
 import com.da.dangan.domain.DaCzrkdj;
-import com.da.dangan.domain.DaPicturesRecard;
 import com.da.dangan.domain.vo.Czrkdj1;
 import com.da.dangan.domain.vo.Czrkdj2;
 import com.da.dangan.domain.vo.Czrkdj3;
 import com.da.dangan.domain.vo.Czrkdjczk;
 import com.da.dangan.service.IDaCzrkdjService;
-import com.da.dangan.service.IDaPicturesRecardService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -38,8 +36,6 @@ import java.util.stream.Collectors;
 public class DaCzrkdjController extends BaseController {
     @Autowired
     private IDaCzrkdjService daCzrkdjService;
-    @Autowired
-    private IDaPicturesRecardService daPicturesRecardService;
 
     /**
      * 查询常住人口登记列表
@@ -129,17 +125,6 @@ public class DaCzrkdjController extends BaseController {
         return success(daCzrkdjService.selectDaCzrkdjById(id));
     }
 
-    /*    *//**
-     * 新增常住人口登记
-     *//*
-    @PreAuthorize("@ss.hasPermi('dangan:czrkdj:add')")
-    @Log(title = "常住人口登记", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody DaCzrkdj daCzrkdj)
-    {
-        return toAjax(daCzrkdjService.insertDaCzrkdj(daCzrkdj));
-    }*/
-
     /**
      * 新增常住人口登记
      */
@@ -147,15 +132,7 @@ public class DaCzrkdjController extends BaseController {
     @Log(title = "常住人口登记", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody DaCzrkdj daCzrkdj) {
-        String[] picIds = daCzrkdj.getPicIds().split(",");
+        daCzrkdj.setCreateBy(getUsername());
-        if (picIds != null && picIds.length > 0) {
-            for (String picid : picIds) {
-                DaPicturesRecard picRecard = new DaPicturesRecard();
-                picRecard.setId(Long.parseLong(picid));
-                picRecard.setRecognize("1");
-                daPicturesRecardService.updateDaPicturesRecard(picRecard);
-            }
-        }
         return toAjax(daCzrkdjService.insertDaCzrkdj(daCzrkdj));
     }
 

dangan-dangan/src/main/java/com/da/dangan/controller/DaPicturesRecardController.java

@@ -62,6 +62,18 @@ public class DaPicturesRecardController extends BaseController
         return getDataTable(list);
     }
 
+    /**
+     * 任务记录查询相关 档案图片信息记录列表
+     */
+   // @PreAuthorize("@ss.hasPermi('dangan:pictureRecard:list')")
+    @GetMapping("/listByIds")
+    public TableDataInfo listByIds(Long[] ids)
+    {
+        startPage();
+        List<DaPicturesRecard> list = daPicturesRecardService.selectDaPicturesRecardByIds(ids);
+        return getDataTable(list);
+    }
+
     /**
      * 导出档案图片信息记录列表
      */

dangan-dangan/src/main/java/com/da/dangan/controller/DaQyzController.java

@@ -28,7 +28,6 @@ import java.util.List;
 public class DaQyzController extends BaseController {
     @Autowired
     private IDaQyzService daQyzService;
-
     /**
      * 查询迁移证列表
      */
@@ -75,6 +74,7 @@ public class DaQyzController extends BaseController {
     @Log(title = "迁移证", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody DaQyz daQyz) {
+        daQyz.setCreateBy(getUsername());
         return toAjax(daQyzService.insertDaQyz(daQyz));
     }
 

dangan-dangan/src/main/java/com/da/dangan/controller/DaYtzmController.java

@@ -28,7 +28,6 @@ import java.util.List;
 public class DaYtzmController extends BaseController {
     @Autowired
     private IDaYtzmService daYtzmService;
-
     /**
      * 查询一胎证明列表
      */
@@ -75,6 +74,7 @@ public class DaYtzmController extends BaseController {
     @Log(title = "一胎证明", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody DaYtzm daYtzm) {
+        daYtzm.setCreateBy(getUsername());
         return toAjax(daYtzmService.insertDaYtzm(daYtzm));
     }
 

dangan-dangan/src/main/java/com/da/dangan/controller/DaZfnyhkcgController.java

@@ -28,7 +28,6 @@ import java.util.List;
 public class DaZfnyhkcgController extends BaseController {
     @Autowired
     private IDaZfnyhkcgService daZfnyhkcgService;
-
     /**
      * 查询转非农业人口批复存根列表
      */
@@ -75,6 +74,7 @@ public class DaZfnyhkcgController extends BaseController {
     @Log(title = "转非农业人口批复存根", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody DaZfnyhkcg daZfnyhkcg) {
+        daZfnyhkcg.setCreateBy(getUsername());
         return toAjax(daZfnyhkcgService.insertDaZfnyhkcg(daZfnyhkcg));
     }
 

dangan-dangan/src/main/java/com/da/dangan/controller/DaZqzController.java

@@ -28,7 +28,6 @@ import java.util.List;
 public class DaZqzController extends BaseController {
     @Autowired
     private IDaZqzService daZqzService;
-
     /**
      * 查询准迁证列表
      */
@@ -75,6 +74,7 @@ public class DaZqzController extends BaseController {
     @Log(title = "准迁证", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody DaZqz daZqz) {
+        daZqz.setCreateBy(getUsername());
         return toAjax(daZqzService.insertDaZqz(daZqz));
     }
 

dangan-dangan/src/main/java/com/da/dangan/domain/DaBirthDj.java

@@ -19,6 +19,10 @@ public class DaBirthDj extends BaseEntity {
      */
     private Long id;
 
+    /** 任务id */
+    @Excel(name = "任务id")
+    private Long taskId;
+
     /**
      * 业务类型(字典)
      */
@@ -488,10 +492,19 @@ public class DaBirthDj extends BaseEntity {
         return auditReason;
     }
 
+    public Long getTaskId() {
+        return taskId;
+    }
+
+    public void setTaskId(Long taskId) {
+        this.taskId = taskId;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
                 .append("id", getId())
+                .append("taskId", getTaskId())
                 .append("ywType", getYwType())
                 .append("muId", getMuId())
                 .append("muPath", getMuPath())

dangan-dangan/src/main/java/com/da/dangan/domain/DaCzrkdj.java

@@ -17,6 +17,10 @@ public class DaCzrkdj extends BaseEntity {
     /** id */
     private Long id;
 
+    /** 任务id */
+    @Excel(name = "任务id")
+    private Long taskId;
+
     /** 业务类型(字典) */
     //@Excel(name = "业务类型(字典)")
     private String ywType;
@@ -238,6 +242,14 @@ public class DaCzrkdj extends BaseEntity {
      */
     private Long userId;
 
+    public Long getTaskId() {
+        return taskId;
+    }
+
+    public void setTaskId(Long taskId) {
+        this.taskId = taskId;
+    }
+
     public Long getUserId() {
         return userId;
     }
@@ -736,6 +748,7 @@ public class DaCzrkdj extends BaseEntity {
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
                 .append("id", getId())
+                .append("taskId", getTaskId())
                 .append("ywType", getYwType())
                 .append("muId", getMuId())
                 .append("muPath", getMuPath())

dangan-dangan/src/main/java/com/da/dangan/domain/DaQyz.java

@@ -19,6 +19,10 @@ public class DaQyz extends BaseEntity {
      */
     private Long id;
 
+    /** 任务id */
+    @Excel(name = "任务id")
+    private Long taskId;
+
     /**
      * 业务类型(字典)
      */
@@ -488,10 +492,19 @@ public class DaQyz extends BaseEntity {
         return auditReason;
     }
 
+    public Long getTaskId() {
+        return taskId;
+    }
+
+    public void setTaskId(Long taskId) {
+        this.taskId = taskId;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
                 .append("id", getId())
+                .append("taskId", getTaskId())
                 .append("ywType", getYwType())
                 .append("muId", getMuId())
                 .append("muPath", getMuPath())

dangan-dangan/src/main/java/com/da/dangan/domain/DaTask.java

@@ -9,76 +9,59 @@ import com.da.common.core.domain.BaseEntity;
  * 识别任务记录对象 da_task
  *
  * @author hs
- * @date 2024-06-20
+ * @date 2024-07-01
  */
-public class DaTask extends BaseEntity {
+public class DaTask extends BaseEntity
+{
     private static final long serialVersionUID = 1L;
 
-    /**
+    /** 任务id */
-     * 任务id
-     */
     private Long id;
 
-    /**
+    /** 目录id */
-     * 目录id
-     */
     @Excel(name = "目录id")
     private Long muId;
 
-    /**
+    /** 业务类型 */
-     * 业务类型
-     */
     @Excel(name = "业务类型")
     private String ywType;
 
-    /**
+    /** 档案目录路径 */
-     * 任务图片ids
+    @Excel(name = "档案目录路径")
-     */
+    private String muPath;
-    @Excel(name = "任务图片ids")
-    private String picIds;
 
-    /**
+    /** 处理图片数量 */
-     * 任务数量
+    @Excel(name = "处理图片数量")
-     */
-    @Excel(name = "任务数量")
     private Long num;
 
-    /**
+    /** 任务图片ids */
-     * 档案目录路径
+    @Excel(name = "任务图片ids")
-     */
+    private String picIds;
-    @Excel(name = "档案目录路径")
-    private String muPath;
 
-    /**
+    /** 任务状态(字典) */
-     * 任务状态(字典)
-     */
     @Excel(name = "任务状态(字典)")
     private String status;
 
-    /**
+    /** 成功数 */
-     * 成功
+    @Excel(name = "成功数")
-     */
-    @Excel(name = "成功")
     private Long successNum;
 
-    /**
+    /** 成功图片ids */
-     * 任务图片ids
+    @Excel(name = "成功图片ids")
-     */
-    @Excel(name = "任务图片ids")
     private String successIds;
 
-    /**
+    /** 失败数 */
-     * 失败
+    @Excel(name = "失败数")
-     */
-    @Excel(name = "失败")
     private Long failNum;
 
-    /**
+    /** 失败图片ids */
-     * 任务图片ids
+    @Excel(name = "失败图片ids")
-     */
-    @Excel(name = "任务图片ids")
     private String failIds;
 
+    /** 返回结果 */
+    @Excel(name = "返回结果")
+    private String resultStr;
+
     /**
      * 当前用户id
      */
@@ -92,108 +75,130 @@ public class DaTask extends BaseEntity {
         this.userId = userId;
     }
 
-    public void setId(Long id) {
+    public void setId(Long id)
+    {
         this.id = id;
     }
 
-    public Long getId() {
+    public Long getId()
+    {
         return id;
     }
-
+    public void setMuId(Long muId)
-    public void setMuId(Long muId) {
+    {
         this.muId = muId;
     }
 
-    public Long getMuId() {
+    public Long getMuId()
+    {
         return muId;
     }
-
+    public void setYwType(String ywType)
-    public void setYwType(String ywType) {
+    {
         this.ywType = ywType;
     }
 
-    public String getYwType() {
+    public String getYwType()
+    {
         return ywType;
     }
-
+    public void setMuPath(String muPath)
-    public void setPicIds(String picIds) {
+    {
-        this.picIds = picIds;
+        this.muPath = muPath;
     }
 
-    public String getPicIds() {
+    public String getMuPath()
-        return picIds;
+    {
+        return muPath;
     }
-
+    public void setNum(Long num)
-    public void setNum(Long num) {
+    {
         this.num = num;
     }
 
-    public Long getNum() {
+    public Long getNum()
+    {
         return num;
     }
-
+    public void setPicIds(String picIds)
-    public void setMuPath(String muPath) {
+    {
-        this.muPath = muPath;
+        this.picIds = picIds;
     }
 
-    public String getMuPath() {
+    public String getPicIds()
-        return muPath;
+    {
+        return picIds;
     }
-
+    public void setStatus(String status)
-    public void setStatus(String status) {
+    {
         this.status = status;
     }
 
-    public String getStatus() {
+    public String getStatus()
+    {
         return status;
     }
-
+    public void setSuccessNum(Long successNum)
-    public void setSuccessNum(Long successNum) {
+    {
         this.successNum = successNum;
     }
 
-    public Long getSuccessNum() {
+    public Long getSuccessNum()
+    {
         return successNum;
     }
-
+    public void setSuccessIds(String successIds)
-    public void setSuccessIds(String successIds) {
+    {
         this.successIds = successIds;
     }
 
-    public String getSuccessIds() {
+    public String getSuccessIds()
+    {
         return successIds;
     }
-
+    public void setFailNum(Long failNum)
-    public void setFailNum(Long failNum) {
+    {
         this.failNum = failNum;
     }
 
-    public Long getFailNum() {
+    public Long getFailNum()
+    {
         return failNum;
     }
-
+    public void setFailIds(String failIds)
-    public void setFailIds(String failIds) {
+    {
         this.failIds = failIds;
     }
 
-    public String getFailIds() {
+    public String getFailIds()
+    {
         return failIds;
     }
+    public void setResultStr(String resultStr)
+    {
+        this.resultStr = resultStr;
+    }
+
+    public String getResultStr()
+    {
+        return resultStr;
+    }
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
                 .append("id", getId())
                 .append("muId", getMuId())
                 .append("ywType", getYwType())
-                .append("picIds", getPicIds())
-                .append("num", getNum())
                 .append("muPath", getMuPath())
+                .append("num", getNum())
+                .append("picIds", getPicIds())
                 .append("status", getStatus())
                 .append("successNum", getSuccessNum())
                 .append("successIds", getSuccessIds())
                 .append("failNum", getFailNum())
                 .append("failIds", getFailIds())
+                .append("resultStr", getResultStr())
                 .append("remark", getRemark())
                 .append("createBy", getCreateBy())
                 .append("createTime", getCreateTime())

dangan-dangan/src/main/java/com/da/dangan/domain/DaYtzm.java

@@ -19,6 +19,10 @@ public class DaYtzm extends BaseEntity {
      */
     private Long id;
 
+    /** 任务id */
+    @Excel(name = "任务id")
+    private Long taskId;
+
     /**
      * 业务类型(字典)
      */
@@ -431,11 +435,19 @@ public class DaYtzm extends BaseEntity {
     public String getAuditReason() {
         return auditReason;
     }
+    public Long getTaskId() {
+        return taskId;
+    }
+
+    public void setTaskId(Long taskId) {
+        this.taskId = taskId;
+    }
 
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
                 .append("id", getId())
+                .append("taskId", getTaskId())
                 .append("ywType", getYwType())
                 .append("muId", getMuId())
                 .append("muPath", getMuPath())

dangan-dangan/src/main/java/com/da/dangan/domain/DaZfnyhkcg.java

@@ -19,6 +19,10 @@ public class DaZfnyhkcg extends BaseEntity {
      */
     private Long id;
 
+    /** 任务id */
+    @Excel(name = "任务id")
+    private Long taskId;
+
     /**
      * 业务类型(字典)
      */
@@ -515,11 +519,18 @@ public class DaZfnyhkcg extends BaseEntity {
     public String getAuditReason() {
         return auditReason;
     }
+    public Long getTaskId() {
+        return taskId;
+    }
 
+    public void setTaskId(Long taskId) {
+        this.taskId = taskId;
+    }
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
                 .append("id", getId())
+                .append("taskId", getTaskId())
                 .append("ywType", getYwType())
                 .append("muId", getMuId())
                 .append("muPath", getMuPath())

dangan-dangan/src/main/java/com/da/dangan/domain/DaZqz.java

@@ -18,6 +18,10 @@ public class DaZqz extends BaseEntity
     /** id */
     private Long id;
 
+    /** 任务id */
+    @Excel(name = "任务id")
+    private Long taskId;
+
     /** 业务类型(字典) */
     @Excel(name = "业务类型",dictType = "yw_type")
     private String ywType;
@@ -598,11 +602,18 @@ public class DaZqz extends BaseEntity
     {
         return auditReason;
     }
+    public Long getTaskId() {
+        return taskId;
+    }
 
+    public void setTaskId(Long taskId) {
+        this.taskId = taskId;
+    }
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
                 .append("id", getId())
+                .append("taskId", getTaskId())
                 .append("ywType", getYwType())
                 .append("muId", getMuId())
                 .append("muPath", getMuPath())

dangan-dangan/src/main/java/com/da/dangan/domain/vo/Czrkdj1.java

@@ -19,6 +19,10 @@ public class Czrkdj1 extends BaseEntity {
      */
     private Long id;
 
+    /** 任务id */
+    @Excel(name = "任务id")
+    private Long taskId;
+
     /**
      * 业务类型(字典)
      */
@@ -467,10 +471,23 @@ public class Czrkdj1 extends BaseEntity {
         return auditReason;
     }
 
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getTaskId() {
+        return taskId;
+    }
+
+    public void setTaskId(Long taskId) {
+        this.taskId = taskId;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
                 .append("id", getId())
+                .append("taskId",getTaskId())
                 .append("ywType", getYwType())
                 .append("muId", getMuId())
                 .append("muPath", getMuPath())

dangan-dangan/src/main/java/com/da/dangan/domain/vo/Czrkdj2.java

@@ -19,6 +19,10 @@ public class Czrkdj2 extends BaseEntity {
      */
     private Long id;
 
+    /** 任务id */
+    @Excel(name = "任务id")
+    private Long taskId;
+
     /**
      * 业务类型(字典)
      */
@@ -582,10 +586,19 @@ public class Czrkdj2 extends BaseEntity {
         return auditReason;
     }
 
+    public Long getTaskId() {
+        return taskId;
+    }
+
+    public void setTaskId(Long taskId) {
+        this.taskId = taskId;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
                 .append("id", getId())
+                .append("taskId",getTaskId())
                 .append("ywType", getYwType())
                 .append("muId", getMuId())
                 .append("muPath", getMuPath())

dangan-dangan/src/main/java/com/da/dangan/domain/vo/Czrkdj3.java

@@ -19,6 +19,10 @@ public class Czrkdj3 extends BaseEntity {
      */
     private Long id;
 
+    /** 任务id */
+    @Excel(name = "任务id")
+    private Long taskId;
+
     /**
      * 业务类型(字典)
      */
@@ -604,10 +608,19 @@ public class Czrkdj3 extends BaseEntity {
         return auditReason;
     }
 
+    public Long getTaskId() {
+        return taskId;
+    }
+
+    public void setTaskId(Long taskId) {
+        this.taskId = taskId;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
                 .append("id", getId())
+                .append("taskId",getTaskId())
                 .append("ywType", getYwType())
                 .append("muId", getMuId())
                 .append("muPath", getMuPath())

dangan-dangan/src/main/java/com/da/dangan/domain/vo/Czrkdjczk.java

@@ -19,6 +19,10 @@ public class Czrkdjczk extends BaseEntity {
      */
     private Long id;
 
+    /** 任务id */
+    @Excel(name = "任务id")
+    private Long taskId;
+
     /**
      * 业务类型(字典)
      */
@@ -680,10 +684,19 @@ public class Czrkdjczk extends BaseEntity {
         return auditReason;
     }
 
+    public Long getTaskId() {
+        return taskId;
+    }
+
+    public void setTaskId(Long taskId) {
+        this.taskId = taskId;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
                 .append("id", getId())
+                .append("taskId",getTaskId())
                 .append("ywType", getYwType())
                 .append("muId", getMuId())
                 .append("muPath", getMuPath())

dangan-dangan/src/main/java/com/da/dangan/mapper/DaPicturesRecardMapper.java

@@ -59,4 +59,6 @@ public interface DaPicturesRecardMapper
      * @return 结果
      */
     public int deleteDaPicturesRecardByIds(Long[] ids);
+
+    List<DaPicturesRecard> selectDaPicturesRecardByIds(Long[] ids);
 }

dangan-dangan/src/main/java/com/da/dangan/service/IDaPicturesRecardService.java

@@ -53,4 +53,5 @@ public interface IDaPicturesRecardService
      */
     public AjaxResult deleteDaPicturesRecardByIds(Long[] ids);
 
+    List<DaPicturesRecard> selectDaPicturesRecardByIds(Long[] ids);
 }

dangan-dangan/src/main/java/com/da/dangan/service/impl/DaBirthDjServiceImpl.java

@@ -56,8 +56,19 @@ public class DaBirthDjServiceImpl implements IDaBirthDjService
      * @return 结果
      */
     @Override
+    @Transactional
     public int insertDaBirthDj(DaBirthDj daBirthDj)
     {
+        //识别图片状态改为已识别
+        String[] picIds = daBirthDj.getPicIds().split(",");
+        if(picIds!=null&&picIds.length>0){
+            for(String picid:picIds){
+                DaPicturesRecard picRecard = new DaPicturesRecard();
+                picRecard.setId(Long.parseLong(picid));
+                picRecard.setRecognize("1");
+                daPicturesRecardMapper.updateDaPicturesRecard(picRecard);
+            }
+        }
         daBirthDj.setCreateTime(DateUtils.getNowDate());
         return daBirthDjMapper.insertDaBirthDj(daBirthDj);
     }

dangan-dangan/src/main/java/com/da/dangan/service/impl/DaCzrkdjServiceImpl.java

@@ -6,10 +6,10 @@ import com.da.dangan.domain.DaPicturesRecard;
 import com.da.dangan.mapper.DaCzrkdjMapper;
 import com.da.dangan.mapper.DaPicturesRecardMapper;
 import com.da.dangan.service.IDaCzrkdjService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -21,9 +21,9 @@ import java.util.List;
 @Service
 public class DaCzrkdjServiceImpl implements IDaCzrkdjService 
 {
-    @Autowired
+    @Resource
     private DaCzrkdjMapper daCzrkdjMapper;
-    @Autowired
+    @Resource
     private DaPicturesRecardMapper daPicturesRecardMapper;
     /**
      * 查询常住人口登记
@@ -56,8 +56,19 @@ public class DaCzrkdjServiceImpl implements IDaCzrkdjService
      * @return 结果
      */
     @Override
+    @Transactional
     public int insertDaCzrkdj(DaCzrkdj daCzrkdj)
     {
+        //识别图片状态改为已识别
+        String[] picIds = daCzrkdj.getPicIds().split(",");
+        if (picIds != null && picIds.length > 0) {
+            for (String picid : picIds) {
+                DaPicturesRecard picRecard = new DaPicturesRecard();
+                picRecard.setId(Long.parseLong(picid));
+                picRecard.setRecognize("1");
+                daPicturesRecardMapper.updateDaPicturesRecard(picRecard);
+            }
+        }
         daCzrkdj.setCreateTime(DateUtils.getNowDate());
         return daCzrkdjMapper.insertDaCzrkdj(daCzrkdj);
     }

dangan-dangan/src/main/java/com/da/dangan/service/impl/DaPicturesRecardServiceImpl.java

@@ -94,4 +94,9 @@ public class DaPicturesRecardServiceImpl implements IDaPicturesRecardService
         }
         return AjaxResult.error("系统错误！");
     }
+
+    @Override
+    public List<DaPicturesRecard> selectDaPicturesRecardByIds(Long[] ids) {
+        return daPicturesRecardMapper.selectDaPicturesRecardByIds(ids);
+    }
 }

dangan-dangan/src/main/java/com/da/dangan/service/impl/DaQyzServiceImpl.java

@@ -6,10 +6,10 @@ import com.da.dangan.domain.DaQyz;
 import com.da.dangan.mapper.DaPicturesRecardMapper;
 import com.da.dangan.mapper.DaQyzMapper;
 import com.da.dangan.service.IDaQyzService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -21,9 +21,9 @@ import java.util.List;
 @Service
 public class DaQyzServiceImpl implements IDaQyzService 
 {
-    @Autowired
+    @Resource
     private DaQyzMapper daQyzMapper;
-    @Autowired
+    @Resource
     private DaPicturesRecardMapper daPicturesRecardMapper;
     /**
      * 查询迁移证
@@ -56,8 +56,19 @@ public class DaQyzServiceImpl implements IDaQyzService
      * @return 结果
      */
     @Override
+    @Transactional
     public int insertDaQyz(DaQyz daQyz)
     {
+        //识别图片状态改为已识别
+        String[] picIds = daQyz.getPicIds().split(",");
+        if (picIds != null && picIds.length > 0) {
+            for (String picid : picIds) {
+                DaPicturesRecard picRecard = new DaPicturesRecard();
+                picRecard.setId(Long.parseLong(picid));
+                picRecard.setRecognize("1");
+                daPicturesRecardMapper.updateDaPicturesRecard(picRecard);
+            }
+        }
         daQyz.setCreateTime(DateUtils.getNowDate());
         return daQyzMapper.insertDaQyz(daQyz);
     }

dangan-dangan/src/main/java/com/da/dangan/service/impl/DaYtzmServiceImpl.java

@@ -6,10 +6,10 @@ import com.da.dangan.domain.DaYtzm;
 import com.da.dangan.mapper.DaPicturesRecardMapper;
 import com.da.dangan.mapper.DaYtzmMapper;
 import com.da.dangan.service.IDaYtzmService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -21,9 +21,9 @@ import java.util.List;
 @Service
 public class DaYtzmServiceImpl implements IDaYtzmService 
 {
-    @Autowired
+    @Resource
     private DaYtzmMapper daYtzmMapper;
-    @Autowired
+    @Resource
     private DaPicturesRecardMapper daPicturesRecardMapper;
     /**
      * 查询一胎证明
@@ -56,8 +56,19 @@ public class DaYtzmServiceImpl implements IDaYtzmService
      * @return 结果
      */
     @Override
+    @Transactional
     public int insertDaYtzm(DaYtzm daYtzm)
     {
+        //识别图片状态改为已识别
+        String[] picIds = daYtzm.getPicIds().split(",");
+        if (picIds != null && picIds.length > 0) {
+            for (String picid : picIds) {
+                DaPicturesRecard picRecard = new DaPicturesRecard();
+                picRecard.setId(Long.parseLong(picid));
+                picRecard.setRecognize("1");
+                daPicturesRecardMapper.updateDaPicturesRecard(picRecard);
+            }
+        }
         daYtzm.setCreateTime(DateUtils.getNowDate());
         return daYtzmMapper.insertDaYtzm(daYtzm);
     }

dangan-dangan/src/main/java/com/da/dangan/service/impl/DaZfnyhkcgServiceImpl.java

@@ -56,8 +56,19 @@ public class DaZfnyhkcgServiceImpl implements IDaZfnyhkcgService
      * @return 结果
      */
     @Override
+    @Transactional
     public int insertDaZfnyhkcg(DaZfnyhkcg daZfnyhkcg)
     {
+        //识别图片状态改为已识别
+        String[] picIds = daZfnyhkcg.getPicIds().split(",");
+        if (picIds != null && picIds.length > 0) {
+            for (String picid : picIds) {
+                DaPicturesRecard picRecard = new DaPicturesRecard();
+                picRecard.setId(Long.parseLong(picid));
+                picRecard.setRecognize("1");
+                daPicturesRecardMapper.updateDaPicturesRecard(picRecard);
+            }
+        }
         daZfnyhkcg.setCreateTime(DateUtils.getNowDate());
         return daZfnyhkcgMapper.insertDaZfnyhkcg(daZfnyhkcg);
     }

dangan-dangan/src/main/java/com/da/dangan/service/impl/DaZqzServiceImpl.java

@@ -56,8 +56,19 @@ public class DaZqzServiceImpl implements IDaZqzService
      * @return 结果
      */
     @Override
+    @Transactional
     public int insertDaZqz(DaZqz daZqz)
     {
+        //识别图片状态改为已识别
+        String[] picIds = daZqz.getPicIds().split(",");
+        if (picIds != null && picIds.length > 0) {
+            for (String picid : picIds) {
+                DaPicturesRecard picRecard = new DaPicturesRecard();
+                picRecard.setId(Long.parseLong(picid));
+                picRecard.setRecognize("1");
+                daPicturesRecardMapper.updateDaPicturesRecard(picRecard);
+            }
+        }
         daZqz.setCreateTime(DateUtils.getNowDate());
         return daZqzMapper.insertDaZqz(daZqz);
     }

dangan-dangan/src/main/resources/mapper/dangan/DaBirthDjMapper.xml

@@ -5,6 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.da.dangan.mapper.DaBirthDjMapper">
     <resultMap type="DaBirthDj" id="DaBirthDjResult">
         <result property="id"    column="id"    />
+        <result property="taskId"    column="task_id"    />
         <result property="ywType"    column="yw_type"    />
         <result property="muId"    column="mu_id"    />
         <result property="muPath"    column="mu_path"    />
@@ -45,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectDaBirthDjVo">
-        select id, yw_type, mu_id, mu_path ,birth_num, name, birthday, sex, born_address, m_name, m_age, m_gj, m_nation, m_card_id, f_name, f_age, f_gj, f_nation, f_card_id, home_address, mom_sign, jsry_sign, js_unit, dj_type, pic_ids, pictures, all_pic_ids, all_pics, error_correct, audit_status, audit_name, audit_result, audit_reason, remark, create_by, create_time, update_by, update_time from da_birth_dj
+        select id, task_id, yw_type, mu_id, mu_path, birth_num, name, birthday, sex, born_address, m_name, m_age, m_gj, m_nation, m_card_id, f_name, f_age, f_gj, f_nation, f_card_id, home_address, mom_sign, jsry_sign, js_unit, dj_type, pic_ids, pictures, all_pic_ids, all_pics, error_correct, audit_status, audit_name, audit_result, audit_reason, remark, create_by, create_time, update_by, update_time from da_birth_dj
     </sql>
 
     <select id="selectDaBirthDjList" parameterType="DaBirthDj" resultMap="DaBirthDjResult">
@@ -53,6 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join da_user_catalog uc on b.mu_id = uc.mu_id
         <where>
             <if test="userId != null  "> and uc.user_id = #{userId}</if>
+            <if test="taskId != null "> and task_id = #{taskId}</if>
             <if test="ywType != null  and ywType != ''"> and yw_type = #{ywType}</if>
             <if test="muId != null "> and b.mu_id = #{muId}</if>
             <if test="muPath != null  and muPath != ''"> and mu_path = #{muPath}</if>
@@ -102,6 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertDaBirthDj" parameterType="DaBirthDj" useGeneratedKeys="true" keyProperty="id">
         insert into da_birth_dj
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="taskId != null">task_id,</if>
             <if test="ywType != null">yw_type,</if>
             <if test="muId != null">mu_id,</if>
             <if test="muPath != null">mu_path,</if>
@@ -141,6 +144,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="taskId != null">#{taskId},</if>
             <if test="ywType != null">#{ywType},</if>
             <if test="muId != null">#{muId},</if>
             <if test="muPath != null">#{muPath},</if>
@@ -184,6 +188,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateDaBirthDj" parameterType="DaBirthDj">
         update da_birth_dj
         <trim prefix="SET" suffixOverrides=",">
+            <if test="taskId != null">task_id = #{taskId},</if>
             <if test="ywType != null">yw_type = #{ywType},</if>
             <if test="muId != null">mu_id = #{muId},</if>
             <if test="muPath != null">mu_path = #{muPath},</if>

dangan-dangan/src/main/resources/mapper/dangan/DaCzrkdjMapper.xml

@@ -5,6 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.da.dangan.mapper.DaCzrkdjMapper">
     <resultMap type="DaCzrkdj" id="DaCzrkdjResult">
         <result property="id"    column="id"    />
+        <result property="taskId"    column="task_id"    />
         <result property="ywType"    column="yw_type"    />
         <result property="muId"    column="mu_id"    />
         <result property="muPath"    column="mu_path"    />
@@ -66,7 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectDaCzrkdjVo">
-        select id, yw_type, mu_id, mu_path, relation, name, other_name, used_name, sex, jhr1, jhgx1, jhr2, jhgx2, gmcszqfrq, birthday, address, yj, nation, zjxy, whcd, hyzk, zyjfwcs, bxsqtzz, gmzdhhmqfjgjrq, hsyhdqlbxshsdjhk, hsybxshcqlhsdjhk, hshyqwhd, zxhkrq, zxhkyy, hkdjsxbgjznrsjjblrz1, hkdjsxbgjznrsjjblrz2, jiguan, xzz, hz_name, hb, djrq, byzk, height, blood, zy, sl_reason, sljmsfzqm, qfyj, yxrq, card_id, pic_ids, pictures, all_pic_ids, all_pics, error_correct, audit_status, audit_name, audit_result, audit_reason, remark, create_by, create_time, update_by, update_time from da_czrkdj
+        select id, task_id, yw_type, mu_id, mu_path, relation, name, other_name, used_name, sex, jhr1, jhgx1, jhr2, jhgx2, gmcszqfrq, birthday, address, yj, nation, zjxy, whcd, hyzk, zyjfwcs, bxsqtzz, gmzdhhmqfjgjrq, hsyhdqlbxshsdjhk, hsybxshcqlhsdjhk, hshyqwhd, zxhkrq, zxhkyy, hkdjsxbgjznrsjjblrz1, hkdjsxbgjznrsjjblrz2, jiguan, xzz, hz_name, hb, djrq, byzk, height, blood, zy, sl_reason, sljmsfzqm, qfyj, yxrq, card_id, pic_ids, pictures, all_pic_ids, all_pics, error_correct, audit_status, audit_name, audit_result, audit_reason, remark, create_by, create_time, update_by, update_time from da_czrkdj
     </sql>
 
     <select id="selectDaCzrkdjList" parameterType="DaCzrkdj" resultMap="DaCzrkdjResult">
@@ -74,6 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join da_user_catalog uc on c.mu_id = uc.mu_id
         <where>
             <if test="userId != null  "> and uc.user_id = #{userId}</if>
+            <if test="taskId != null "> and task_id = #{taskId}</if>
             <if test="ywType != null  and ywType != ''"> and yw_type = #{ywType}</if>
             <if test="muId != null "> and c.mu_id = #{muId}</if>
             <if test="muPath != null  and muPath != ''"> and mu_path = #{muPath}</if>
@@ -144,6 +146,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join da_user_catalog uc on c.mu_id = uc.mu_id
         <where>
             <if test="userId != null  "> and uc.user_id = #{userId}</if>
+            <if test="taskId != null "> and task_id = #{taskId}</if>
             <if test="ywType != null  and ywType != ''"> and yw_type = #{ywType}</if>
             <if test="muId != null "> and c.mu_id = #{muId}</if>
             <if test="muPath != null  and muPath != ''"> and mu_path = #{muPath}</if>
@@ -217,6 +220,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertDaCzrkdj" parameterType="DaCzrkdj" useGeneratedKeys="true" keyProperty="id">
         insert into da_czrkdj
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="taskId != null">task_id,</if>
             <if test="ywType != null">yw_type,</if>
             <if test="muId != null">mu_id,</if>
             <if test="muPath != null">mu_path,</if>
@@ -277,6 +281,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="taskId != null">#{taskId},</if>
             <if test="ywType != null">#{ywType},</if>
             <if test="muId != null">#{muId},</if>
             <if test="muPath != null">#{muPath},</if>
@@ -341,6 +346,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateDaCzrkdj" parameterType="DaCzrkdj">
         update da_czrkdj
         <trim prefix="SET" suffixOverrides=",">
+            <if test="taskId != null">task_id = #{taskId},</if>
             <if test="ywType != null">yw_type = #{ywType},</if>
             <if test="muId != null">mu_id = #{muId},</if>
             <if test="muPath != null">mu_path = #{muPath},</if>

dangan-dangan/src/main/resources/mapper/dangan/DaPicturesRecardMapper.xml

@@ -51,6 +51,13 @@
         where id = #{id}
     </select>
 
+    <select id="selectDaPicturesRecardByIds"  resultMap="DaPicturesRecardResult">
+        <include refid="selectDaPicturesRecardVo"/> where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </select>
+
     <insert id="insertDaPicturesRecard" parameterType="DaPicturesRecard" useGeneratedKeys="true" keyProperty="id">
         insert into da_pictures_recard
         <trim prefix="(" suffix=")" suffixOverrides=",">

dangan-dangan/src/main/resources/mapper/dangan/DaQyzMapper.xml

@@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <resultMap type="DaQyz" id="DaQyzResult">
         <result property="id"    column="id"    />
+        <result property="taskId"    column="task_id"    />
         <result property="ywType"    column="yw_type"    />
         <result property="muId"    column="mu_id"    />
         <result property="muPath"    column="mu_path"    />
@@ -46,7 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectDaQyzVo">
-        select id, yw_type, mu_id, mu_path, fw_unit, wj_xh, name1, sex1, card_id1, name2, sex2, card_id2, name3, sex3, card_id3, name4, sex4, card_id4, qy_reason, y_address, qw_address, s_date, e_date, cbr, pic_ids, pictures, all_pic_ids, all_pics, error_correct, audit_status, audit_name, audit_result, audit_reason, remark, create_by, create_time, update_by, update_time from da_qyz
+        select id, task_id, yw_type, mu_id, mu_path, fw_unit, wj_xh, name1, sex1, card_id1, name2, sex2, card_id2, name3, sex3, card_id3, name4, sex4, card_id4, qy_reason, y_address, qw_address, s_date, e_date, cbr, pic_ids, pictures, all_pic_ids, all_pics, error_correct, audit_status, audit_name, audit_result, audit_reason, remark, create_by, create_time, update_by, update_time from da_qyz
     </sql>
 
     <select id="selectDaQyzList" parameterType="DaQyz" resultMap="DaQyzResult">
@@ -54,6 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join da_user_catalog uc on q.mu_id = uc.mu_id
         <where>
             <if test="userId != null"> and uc.user_id = #{userId}</if>
+            <if test="taskId != null "> and task_id = #{taskId}</if>
             <if test="ywType != null  and ywType != ''"> and yw_type = #{ywType}</if>
             <if test="muId != null "> and q.mu_id = #{muId}</if>
             <if test="muPath != null  and muPath != ''"> and mu_path = #{muPath}</if>
@@ -104,6 +106,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertDaQyz" parameterType="DaQyz" useGeneratedKeys="true" keyProperty="id">
         insert into da_qyz
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="taskId != null">task_id,</if>
             <if test="ywType != null">yw_type,</if>
             <if test="muId != null">mu_id,</if>
             <if test="muPath != null">mu_path,</if>
@@ -143,6 +146,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="taskId != null">#{taskId},</if>
             <if test="ywType != null">#{ywType},</if>
             <if test="muId != null">#{muId},</if>
             <if test="muPath != null">#{muPath},</if>
@@ -186,6 +190,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateDaQyz" parameterType="DaQyz">
         update da_qyz
         <trim prefix="SET" suffixOverrides=",">
+            <if test="taskId != null">task_id = #{taskId},</if>
             <if test="ywType != null">yw_type = #{ywType},</if>
             <if test="muId != null">mu_id = #{muId},</if>
             <if test="muPath != null">mu_path = #{muPath},</if>

dangan-dangan/src/main/resources/mapper/dangan/DaTaskMapper.xml

@@ -8,14 +8,15 @@
         <result property="id"    column="id"    />
         <result property="muId"    column="mu_id"    />
         <result property="ywType"    column="yw_type"    />
-        <result property="picIds"    column="pic_ids"    />
-        <result property="num"    column="num"    />
         <result property="muPath"    column="mu_path"    />
+        <result property="num"    column="num"    />
+        <result property="picIds"    column="pic_ids"    />
         <result property="status"    column="status"    />
         <result property="successNum"    column="success_num"    />
         <result property="successIds"    column="success_ids"    />
         <result property="failNum"    column="fail_num"    />
         <result property="failIds"    column="fail_ids"    />
+        <result property="resultStr"    column="result_str"    />
         <result property="remark"    column="remark"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
@@ -24,7 +25,7 @@
     </resultMap>
 
     <sql id="selectDaTaskVo">
-        select id, mu_id, yw_type, pic_ids, num, mu_path, status, success_num, success_ids, fail_num, fail_ids, remark, create_by, create_time, update_by, update_time from da_task
+        select id, mu_id, yw_type, mu_path, num, pic_ids, status, success_num, success_ids, fail_num, fail_ids, result_str, remark, create_by, create_time, update_by, update_time from da_task
     </sql>
 
     <select id="selectDaTaskList" parameterType="DaTask" resultMap="DaTaskResult">
@@ -32,16 +33,17 @@
         left join da_user_catalog uc on t.mu_id = uc.mu_id
         <where>
             <if test="userId != null"> and uc.user_id = #{userId}</if>
-            <if test="muId != null "> and t.mu_id = #{muId}</if>
+            <if test="muId != null "> and mu_id = #{muId}</if>
             <if test="ywType != null  and ywType != ''"> and yw_type = #{ywType}</if>
-            <if test="picIds != null  and picIds != ''"> and pic_ids = #{picIds}</if>
-            <if test="num != null "> and num = #{num}</if>
             <if test="muPath != null  and muPath != ''"> and mu_path = #{muPath}</if>
+            <if test="num != null "> and num = #{num}</if>
+            <if test="picIds != null  and picIds != ''"> and pic_ids = #{picIds}</if>
             <if test="status != null  and status != ''"> and status = #{status}</if>
             <if test="successNum != null "> and success_num = #{successNum}</if>
             <if test="successIds != null  and successIds != ''"> and success_ids = #{successIds}</if>
             <if test="failNum != null "> and fail_num = #{failNum}</if>
             <if test="failIds != null  and failIds != ''"> and fail_ids = #{failIds}</if>
+            <if test="resultStr != null  and resultStr != ''"> and result_str = #{resultStr}</if>
         </where>
     </select>
 
@@ -55,14 +57,15 @@
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="muId != null">mu_id,</if>
             <if test="ywType != null">yw_type,</if>
-            <if test="picIds != null">pic_ids,</if>
-            <if test="num != null">num,</if>
             <if test="muPath != null">mu_path,</if>
+            <if test="num != null">num,</if>
+            <if test="picIds != null">pic_ids,</if>
             <if test="status != null">status,</if>
             <if test="successNum != null">success_num,</if>
             <if test="successIds != null">success_ids,</if>
             <if test="failNum != null">fail_num,</if>
             <if test="failIds != null">fail_ids,</if>
+            <if test="resultStr != null">result_str,</if>
             <if test="remark != null">remark,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
@@ -72,14 +75,15 @@
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="muId != null">#{muId},</if>
             <if test="ywType != null">#{ywType},</if>
-            <if test="picIds != null">#{picIds},</if>
-            <if test="num != null">#{num},</if>
             <if test="muPath != null">#{muPath},</if>
+            <if test="num != null">#{num},</if>
+            <if test="picIds != null">#{picIds},</if>
             <if test="status != null">#{status},</if>
             <if test="successNum != null">#{successNum},</if>
             <if test="successIds != null">#{successIds},</if>
             <if test="failNum != null">#{failNum},</if>
             <if test="failIds != null">#{failIds},</if>
+            <if test="resultStr != null">#{resultStr},</if>
             <if test="remark != null">#{remark},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
@@ -93,14 +97,15 @@
         <trim prefix="SET" suffixOverrides=",">
             <if test="muId != null">mu_id = #{muId},</if>
             <if test="ywType != null">yw_type = #{ywType},</if>
-            <if test="picIds != null">pic_ids = #{picIds},</if>
-            <if test="num != null">num = #{num},</if>
             <if test="muPath != null">mu_path = #{muPath},</if>
+            <if test="num != null">num = #{num},</if>
+            <if test="picIds != null">pic_ids = #{picIds},</if>
             <if test="status != null">status = #{status},</if>
             <if test="successNum != null">success_num = #{successNum},</if>
             <if test="successIds != null">success_ids = #{successIds},</if>
             <if test="failNum != null">fail_num = #{failNum},</if>
             <if test="failIds != null">fail_ids = #{failIds},</if>
+            <if test="resultStr != null">result_str = #{resultStr},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>

dangan-dangan/src/main/resources/mapper/dangan/DaYtzmMapper.xml

@@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <resultMap type="DaYtzm" id="DaYtzmResult">
         <result property="id"    column="id"    />
+        <result property="taskId"    column="task_id"    />
         <result property="ywType"    column="yw_type"    />
         <result property="muId"    column="mu_id"    />
         <result property="muPath"    column="mu_path"    />
@@ -42,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectDaYtzmVo">
-        select id, yw_type, mu_id, mu_path, year, xh, w_name, w_unit, w_card_id, m_name, m_unit, m_card_id, syzh, birthday, hospital, baby_sex, suggest, pcs_address, tb_date1, tb_date2, pic_ids, pictures, all_pic_ids, all_pics, error_correct, audit_status, audit_name, audit_result, audit_reason, remark, create_by, create_time, update_by, update_time from da_ytzm
+        select id, task_id, yw_type, mu_id, mu_path, year, xh, w_name, w_unit, w_card_id, m_name, m_unit, m_card_id, syzh, birthday, hospital, baby_sex, suggest, pcs_address, tb_date1, tb_date2, pic_ids, pictures, all_pic_ids, all_pics, error_correct, audit_status, audit_name, audit_result, audit_reason, remark, create_by, create_time, update_by, update_time from da_ytzm
     </sql>
 
     <select id="selectDaYtzmList" parameterType="DaYtzm" resultMap="DaYtzmResult">
@@ -50,6 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join da_user_catalog uc on y.mu_id = uc.mu_id
         <where>
             <if test="userId != null  "> and uc.user_id = #{userId}</if>
+            <if test="taskId != null "> and task_id = #{taskId}</if>
             <if test="ywType != null  and ywType != ''"> and yw_type = #{ywType}</if>
             <if test="muId != null "> and y.mu_id = #{muId}</if>
             <if test="muPath != null  and muPath != ''"> and mu_path = #{muPath}</if>
@@ -94,6 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertDaYtzm" parameterType="DaYtzm" useGeneratedKeys="true" keyProperty="id">
         insert into da_ytzm
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="taskId != null">task_id,</if>
             <if test="ywType != null">yw_type,</if>
             <if test="muId != null">mu_id,</if>
             <if test="muPath != null">mu_path,</if>
@@ -129,6 +132,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="taskId != null">#{taskId},</if>
             <if test="ywType != null">#{ywType},</if>
             <if test="muId != null">#{muId},</if>
             <if test="muPath != null">#{muPath},</if>
@@ -168,6 +172,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateDaYtzm" parameterType="DaYtzm">
         update da_ytzm
         <trim prefix="SET" suffixOverrides=",">
+            <if test="taskId != null">task_id = #{taskId},</if>
             <if test="ywType != null">yw_type = #{ywType},</if>
             <if test="muId != null">mu_id = #{muId},</if>
             <if test="muPath != null">mu_path = #{muPath},</if>

dangan-dangan/src/main/resources/mapper/dangan/DaZfnyhkcgMapper.xml

@@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <resultMap type="DaZfnyhkcg" id="DaZfnyhkcgResult">
         <result property="id"    column="id"    />
+        <result property="taskId"    column="task_id"    />
         <result property="ywType"    column="yw_type"    />
         <result property="muId"    column="mu_id"    />
         <result property="muPath"    column="mu_path"    />
@@ -48,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectDaZfnyhkcgVo">
-        select id, yw_type, mu_id, mu_path, num, name, address, relation1, name1, sex1, relation2, name2, sex2, relation3, name3, sex3, relation4, name4, sex4, relation5, name5, sex5, jg1, jg2, cbr, cb_date, pic_ids, pictures, all_pic_ids, all_pics, error_correct, audit_status, audit_name, audit_result, audit_reason, remark, create_by, create_time, update_by, update_time from da_zfnyhkcg
+        select id, task_id, yw_type, mu_id, mu_path, num, name, address, relation1, name1, sex1, relation2, name2, sex2, relation3, name3, sex3, relation4, name4, sex4, relation5, name5, sex5, jg1, jg2, cbr, cb_date, pic_ids, pictures, all_pic_ids, all_pics, error_correct, audit_status, audit_name, audit_result, audit_reason, remark, create_by, create_time, update_by, update_time from da_zfnyhkcg
     </sql>
 
     <select id="selectDaZfnyhkcgList" parameterType="DaZfnyhkcg" resultMap="DaZfnyhkcgResult">
@@ -56,6 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join da_user_catalog uc on z.mu_id = uc.mu_id
         <where>
             <if test="userId != null "> and uc.user_id = #{userId}</if>
+            <if test="taskId != null "> and task_id = #{taskId}</if>
             <if test="ywType != null  and ywType != ''"> and yw_type = #{ywType}</if>
             <if test="muId != null "> and z.mu_id = #{muId}</if>
             <if test="muPath != null  and muPath != ''"> and mu_path = #{muPath}</if>
@@ -110,6 +112,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertDaZfnyhkcg" parameterType="DaZfnyhkcg" useGeneratedKeys="true" keyProperty="id">
         insert into da_zfnyhkcg
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="taskId != null">task_id,</if>
             <if test="ywType != null">yw_type,</if>
             <if test="muId != null">mu_id,</if>
             <if test="muPath != null">mu_path,</if>
@@ -151,6 +154,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="taskId != null">#{taskId},</if>
             <if test="ywType != null">#{ywType},</if>
             <if test="muId != null">#{muId},</if>
             <if test="muPath != null">#{muPath},</if>
@@ -196,6 +200,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateDaZfnyhkcg" parameterType="DaZfnyhkcg">
         update da_zfnyhkcg
         <trim prefix="SET" suffixOverrides=",">
+            <if test="taskId != null">task_id = #{taskId},</if>
             <if test="ywType != null">yw_type = #{ywType},</if>
             <if test="muId != null">mu_id = #{muId},</if>
             <if test="muPath != null">mu_path = #{muPath},</if>

dangan-dangan/src/main/resources/mapper/dangan/DaZqzMapper.xml

@@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <resultMap type="DaZqz" id="DaZqzResult">
         <result property="id"    column="id"    />
+        <result property="taskId"    column="task_id"    />
         <result property="ywType"    column="yw_type"    />
         <result property="muId"    column="mu_id"    />
         <result property="muPath"    column="mu_path"    />
@@ -57,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectDaZqzVo">
-        select id, yw_type, mu_id, mu_path, num, name, card_id, address, dj_jg, relation1, name1, sex1, birth_date1, card_id1, relation2, name2, sex2, birth_date2, card_id2, relation3, name3, sex3, birth_date3, card_id3, relation4, name4, sex4, birth_date4, card_id4, fwdw, qr_address, zq_reason, pzjg, cbr, qf_date, pic_ids, pictures, all_pic_ids, all_pics, error_correct, audit_status, audit_name, audit_result, audit_reason, remark, create_by, create_time, update_by, update_time from da_zqz
+        select id, task_id, yw_type, mu_id, mu_path, num, name, card_id, address, dj_jg, relation1, name1, sex1, birth_date1, card_id1, relation2, name2, sex2, birth_date2, card_id2, relation3, name3, sex3, birth_date3, card_id3, relation4, name4, sex4, birth_date4, card_id4, fwdw, qr_address, zq_reason, pzjg, cbr, qf_date, pic_ids, pictures, all_pic_ids, all_pics, error_correct, audit_status, audit_name, audit_result, audit_reason, remark, create_by, create_time, update_by, update_time from da_zqz
     </sql>
 
     <select id="selectDaZqzList" parameterType="DaZqz" resultMap="DaZqzResult">
@@ -65,6 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join da_user_catalog uc on z.mu_id = uc.mu_id
         <where>
             <if test="userId != null  "> and uc.user_id = #{userId}</if>
+            <if test="taskId != null "> and task_id = #{taskId}</if>
             <if test="ywType != null  and ywType != ''"> and yw_type = #{ywType}</if>
             <if test="muId != null "> and z.mu_id = #{muId}</if>
             <if test="muPath != null  and muPath != ''"> and mu_path = #{muPath}</if>
@@ -127,6 +129,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertDaZqz" parameterType="DaZqz" useGeneratedKeys="true" keyProperty="id">
         insert into da_zqz
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="taskId != null">task_id,</if>
             <if test="ywType != null">yw_type,</if>
             <if test="muId != null">mu_id,</if>
             <if test="muPath != null">mu_path,</if>
@@ -177,6 +180,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="taskId != null">#{taskId},</if>
             <if test="ywType != null">#{ywType},</if>
             <if test="muId != null">#{muId},</if>
             <if test="muPath != null">#{muPath},</if>
@@ -231,6 +235,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateDaZqz" parameterType="DaZqz">
         update da_zqz
         <trim prefix="SET" suffixOverrides=",">
+            <if test="taskId != null">task_id = #{taskId},</if>
             <if test="ywType != null">yw_type = #{ywType},</if>
             <if test="muId != null">mu_id = #{muId},</if>
             <if test="muPath != null">mu_path = #{muPath},</if>