diff --git a/dangan-dangan/src/main/java/com/da/dangan/controller/DaTaskController.java b/dangan-dangan/src/main/java/com/da/dangan/controller/DaTaskController.java index 60aaf0c..2abadb8 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/controller/DaTaskController.java +++ b/dangan-dangan/src/main/java/com/da/dangan/controller/DaTaskController.java @@ -1,25 +1,19 @@ package com.da.dangan.controller; -import java.util.List; -import javax.servlet.http.HttpServletResponse; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; import com.da.common.annotation.Log; import com.da.common.core.controller.BaseController; import com.da.common.core.domain.AjaxResult; +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.DaTask; import com.da.dangan.service.IDaTaskService; -import com.da.common.utils.poi.ExcelUtil; -import com.da.common.core.page.TableDataInfo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 识别任务记录Controller @@ -77,6 +71,7 @@ public class DaTaskController extends BaseController @PostMapping public AjaxResult add(@RequestBody DaTask daTask) { + daTask.setCreateBy(getUsername()); return toAjax(daTaskService.insertDaTask(daTask)); } diff --git a/dangan-dangan/src/main/java/com/da/dangan/controller/DangAnCollectController.java b/dangan-dangan/src/main/java/com/da/dangan/controller/DangAnCollectController.java index 95ad2ce..cf306a7 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/controller/DangAnCollectController.java +++ b/dangan-dangan/src/main/java/com/da/dangan/controller/DangAnCollectController.java @@ -130,6 +130,7 @@ public class DangAnCollectController extends BaseController { List ids = picRecards.stream().map(DaPicturesRecard::getId).collect(Collectors.toList()); String ywType = picRecards.get(0).getYwType(); Long muId = picRecards.get(0).getMuId(); + String muPath = picRecards.get(0).getMuPath(); // String singleOrDouble = picRecards.get(0).getSingelOrDouble(); //获取所有的文件 List files = new ArrayList<>(); @@ -221,6 +222,7 @@ public class DangAnCollectController extends BaseController { daCzrkdj.setCreateTime(new Date()); daCzrkdj.setYwType(ywType); daCzrkdj.setMuId(muId); + daCzrkdj.setMuPath(muPath); daCzrkdj.setAuditStatus("0"); daCzrkdj.setErrorCorrect("0"); daCzrkdjService.insertDaCzrkdj(daCzrkdj); @@ -255,6 +257,7 @@ public class DangAnCollectController extends BaseController { daBirthdj.setCreateTime(new Date()); daBirthdj.setYwType(ywType); daBirthdj.setMuId(muId); + daBirthdj.setMuPath(muPath); daBirthdj.setAuditStatus("0"); daBirthdj.setErrorCorrect("0"); daBirthDjService.insertDaBirthDj(daBirthdj); @@ -288,6 +291,7 @@ public class DangAnCollectController extends BaseController { qyz.setCreateTime(new Date()); qyz.setYwType(ywType); qyz.setMuId(muId); + qyz.setMuPath(muPath); qyz.setAuditStatus("0"); qyz.setErrorCorrect("0"); daQyzService.insertDaQyz(qyz); @@ -321,6 +325,7 @@ public class DangAnCollectController extends BaseController { ytzm.setCreateTime(new Date()); ytzm.setYwType(ywType); ytzm.setMuId(muId); + ytzm.setMuPath(muPath); ytzm.setAuditStatus("0"); ytzm.setErrorCorrect("0"); daYtzmService.insertDaYtzm(ytzm); @@ -354,6 +359,7 @@ public class DangAnCollectController extends BaseController { zfnyhkcg.setCreateTime(new Date()); zfnyhkcg.setYwType(ywType); zfnyhkcg.setMuId(muId); + zfnyhkcg.setMuPath(muPath); zfnyhkcg.setAuditStatus("0"); zfnyhkcg.setErrorCorrect("0"); daZfnyhkcgService.insertDaZfnyhkcg(zfnyhkcg); @@ -387,6 +393,7 @@ public class DangAnCollectController extends BaseController { zqz.setCreateTime(new Date()); zqz.setYwType(ywType); zqz.setMuId(muId); + zqz.setMuPath(muPath); zqz.setAuditStatus("0"); zqz.setErrorCorrect("0"); daZqzService.insertDaZqz(zqz); @@ -624,7 +631,7 @@ public class DangAnCollectController extends BaseController { /** - * 图片批量识别处理进度 + * 图片批量识别处理进度____暂时未用 */ @GetMapping("/progress") public ResponseEntity getProgress() { diff --git a/dangan-dangan/src/main/java/com/da/dangan/domain/DaBirthDj.java b/dangan-dangan/src/main/java/com/da/dangan/domain/DaBirthDj.java index 2006b2f..145d546 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/domain/DaBirthDj.java +++ b/dangan-dangan/src/main/java/com/da/dangan/domain/DaBirthDj.java @@ -7,184 +7,255 @@ import org.apache.commons.lang3.builder.ToStringStyle; /** * 出生登记对象 da_birth_dj - * + * * @author hs * @date 2024-06-05 */ -public class DaBirthDj extends BaseEntity -{ +public class DaBirthDj extends BaseEntity { private static final long serialVersionUID = 1L; - /** id */ + /** + * id + */ private Long id; - /** 业务类型(字典) */ - @Excel(name = "业务类型",dictType = "yw_type") + /** + * 业务类型(字典) + */ + @Excel(name = "业务类型", dictType = "yw_type") private String ywType; - /** 目录id */ + /** + * 目录id + */ @Excel(name = "目录id") private Long muId; - /** 出生证编号 */ + /** + * 档案目录路径 + */ + @Excel(name = "档案目录路径") + private String muPath; + + public String getMuPath() { + return muPath; + } + + public void setMuPath(String muPath) { + this.muPath = muPath; + } + + /** + * 出生证编号 + */ @Excel(name = "出生证编号") private String birthNum; - /** 婴儿姓名 */ + /** + * 婴儿姓名 + */ @Excel(name = "婴儿姓名") private String name; - /** 出生时间 */ + /** + * 出生时间 + */ @Excel(name = "出生时间") private String birthday; - /** 性别 */ + /** + * 性别 + */ @Excel(name = "性别") private String sex; - /** 出生地点 */ + /** + * 出生地点 + */ @Excel(name = "出生地点") private String bornAddress; - /** 母亲姓名 */ + /** + * 母亲姓名 + */ @Excel(name = "母亲姓名") private String mName; - /** 母亲年龄 */ + /** + * 母亲年龄 + */ @Excel(name = "母亲年龄") private String mAge; - /** 母亲国籍 */ + /** + * 母亲国籍 + */ @Excel(name = "母亲国籍") private String mGj; - /** 母亲民族 */ + /** + * 母亲民族 + */ @Excel(name = "母亲民族") private String mNation; - /** 母亲身份证号 */ + /** + * 母亲身份证号 + */ @Excel(name = "母亲身份证号") private String mCardId; - /** 父亲姓名 */ + /** + * 父亲姓名 + */ @Excel(name = "父亲姓名") private String fName; - /** 父亲年龄 */ + /** + * 父亲年龄 + */ @Excel(name = "父亲年龄") private String fAge; - /** 父亲国籍 */ + /** + * 父亲国籍 + */ @Excel(name = "父亲国籍") private String fGj; - /** 父亲民族 */ + /** + * 父亲民族 + */ @Excel(name = "父亲民族") private String fNation; - /** 父亲身份证号 */ + /** + * 父亲身份证号 + */ @Excel(name = "父亲身份证号") private String fCardId; - /** 家庭住址 */ + /** + * 家庭住址 + */ @Excel(name = "家庭住址") private String homeAddress; - /** 婴儿母亲签字 */ + /** + * 婴儿母亲签字 + */ @Excel(name = "婴儿母亲签字") private String momSign; - /** 接生人员签字 */ + /** + * 接生人员签字 + */ @Excel(name = "接生人员签字") private String jsrySign; - /** 接生单位 */ + /** + * 接生单位 + */ @Excel(name = "接生单位") private String jsUnit; - /** 出生登记类型(字典) */ - // @Excel(name = "出生登记类型(字典)") + /** + * 出生登记类型(字典) + */ + // @Excel(name = "出生登记类型(字典)") private String djType; - /** 识别图片id */ + /** + * 识别图片id + */ @Excel(name = "识别图片id") private String picIds; - /** 识别图片 */ + /** + * 识别图片 + */ @Excel(name = "识别图片") private String pictures; - /** 相关图片id */ + /** + * 相关图片id + */ @Excel(name = "相关图片id") private String allPicIds; - /** 相关图片 */ + /** + * 相关图片 + */ @Excel(name = "相关图片") private String allPics; - /** 是否纠错(字典0否1是) */ - @Excel(name = "是否纠错",dictType = "error_correct") + /** + * 是否纠错(字典0否1是) + */ + @Excel(name = "是否纠错", dictType = "error_correct") private String errorCorrect; - /** 审核状态(字典) */ - @Excel(name = "审核状态",dictType = "audit_status") + /** + * 审核状态(字典) + */ + @Excel(name = "审核状态", dictType = "audit_status") private String auditStatus; - /** 审核人 */ + /** + * 审核人 + */ @Excel(name = "审核人") private String auditName; - /** 审核结果 */ + /** + * 审核结果 + */ @Excel(name = "审核结果") private String auditResult; - /** 审核原由 */ + /** + * 审核原由 + */ @Excel(name = "审核原由") private String auditReason; - public void setId(Long id) - { + public void setId(Long id) { this.id = id; } - public Long getId() - { + public Long getId() { return id; } - public void setYwType(String ywType) - { + + public void setYwType(String ywType) { this.ywType = ywType; } - public String getYwType() - { + public String getYwType() { return ywType; } - public void setMuId(Long muId) - { + + public void setMuId(Long muId) { this.muId = muId; } - public Long getMuId() - { + public Long getMuId() { return muId; } - public void setBirthNum(String birthNum) - { + + public void setBirthNum(String birthNum) { this.birthNum = birthNum; } - public String getBirthNum() - { + public String getBirthNum() { return birthNum; } - public void setName(String name) - { + + public void setName(String name) { this.name = name; } - public String getName() - { + public String getName() { return name; } @@ -196,281 +267,255 @@ public class DaBirthDj extends BaseEntity this.birthday = birthday; } - public void setSex(String sex) - { + public void setSex(String sex) { this.sex = sex; } - public String getSex() - { + public String getSex() { return sex; } - public void setBornAddress(String bornAddress) - { + + public void setBornAddress(String bornAddress) { this.bornAddress = bornAddress; } - public String getBornAddress() - { + public String getBornAddress() { return bornAddress; } - public void setmName(String mName) - { + + public void setmName(String mName) { this.mName = mName; } - public String getmName() - { + public String getmName() { return mName; } - public void setmAge(String mAge) - { + + public void setmAge(String mAge) { this.mAge = mAge; } - public String getmAge() - { + public String getmAge() { return mAge; } - public void setmGj(String mGj) - { + + public void setmGj(String mGj) { this.mGj = mGj; } - public String getmGj() - { + public String getmGj() { return mGj; } - public void setmNation(String mNation) - { + + public void setmNation(String mNation) { this.mNation = mNation; } - public String getmNation() - { + public String getmNation() { return mNation; } - public void setmCardId(String mCardId) - { + + public void setmCardId(String mCardId) { this.mCardId = mCardId; } - public String getmCardId() - { + public String getmCardId() { return mCardId; } - public void setfName(String fName) - { + + public void setfName(String fName) { this.fName = fName; } - public String getfName() - { + public String getfName() { return fName; } - public void setfAge(String fAge) - { + + public void setfAge(String fAge) { this.fAge = fAge; } - public String getfAge() - { + public String getfAge() { return fAge; } - public void setfGj(String fGj) - { + + public void setfGj(String fGj) { this.fGj = fGj; } - public String getfGj() - { + public String getfGj() { return fGj; } - public void setfNation(String fNation) - { + + public void setfNation(String fNation) { this.fNation = fNation; } - public String getfNation() - { + public String getfNation() { return fNation; } - public void setfCardId(String fCardId) - { + + public void setfCardId(String fCardId) { this.fCardId = fCardId; } - public String getfCardId() - { + public String getfCardId() { return fCardId; } - public void setHomeAddress(String homeAddress) - { + + public void setHomeAddress(String homeAddress) { this.homeAddress = homeAddress; } - public String getHomeAddress() - { + public String getHomeAddress() { return homeAddress; } - public void setMomSign(String momSign) - { + + public void setMomSign(String momSign) { this.momSign = momSign; } - public String getMomSign() - { + public String getMomSign() { return momSign; } - public void setJsrySign(String jsrySign) - { + + public void setJsrySign(String jsrySign) { this.jsrySign = jsrySign; } - public String getJsrySign() - { + public String getJsrySign() { return jsrySign; } - public void setJsUnit(String jsUnit) - { + + public void setJsUnit(String jsUnit) { this.jsUnit = jsUnit; } - public String getJsUnit() - { + public String getJsUnit() { return jsUnit; } - public void setDjType(String djType) - { + + public void setDjType(String djType) { this.djType = djType; } - public String getDjType() - { + public String getDjType() { return djType; } - public void setPicIds(String picIds) - { + + public void setPicIds(String picIds) { this.picIds = picIds; } - public String getPicIds() - { + public String getPicIds() { return picIds; } - public void setPictures(String pictures) - { + + public void setPictures(String pictures) { this.pictures = pictures; } - public String getPictures() - { + public String getPictures() { return pictures; } - public void setAllPicIds(String allPicIds) - { + + public void setAllPicIds(String allPicIds) { this.allPicIds = allPicIds; } - public String getAllPicIds() - { + public String getAllPicIds() { return allPicIds; } - public void setAllPics(String allPics) - { + + public void setAllPics(String allPics) { this.allPics = allPics; } - public String getAllPics() - { + public String getAllPics() { return allPics; } - public void setErrorCorrect(String errorCorrect) - { + + public void setErrorCorrect(String errorCorrect) { this.errorCorrect = errorCorrect; } - public String getErrorCorrect() - { + public String getErrorCorrect() { return errorCorrect; } - public void setAuditStatus(String auditStatus) - { + + public void setAuditStatus(String auditStatus) { this.auditStatus = auditStatus; } - public String getAuditStatus() - { + public String getAuditStatus() { return auditStatus; } - public void setAuditName(String auditName) - { + + public void setAuditName(String auditName) { this.auditName = auditName; } - public String getAuditName() - { + public String getAuditName() { return auditName; } - public void setAuditResult(String auditResult) - { + + public void setAuditResult(String auditResult) { this.auditResult = auditResult; } - public String getAuditResult() - { + public String getAuditResult() { return auditResult; } - public void setAuditReason(String auditReason) - { + + public void setAuditReason(String auditReason) { this.auditReason = auditReason; } - public String getAuditReason() - { + public String getAuditReason() { return auditReason; } @Override public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("ywType", getYwType()) - .append("muId", getMuId()) - .append("birthNum", getBirthNum()) - .append("name", getName()) - .append("birthday", getBirthday()) - .append("sex", getSex()) - .append("bornAddress", getBornAddress()) - .append("mName", getmName()) - .append("mAge", getmAge()) - .append("mGj", getmGj()) - .append("mNation", getmNation()) - .append("mCardId", getmCardId()) - .append("fName", getfName()) - .append("fAge", getfAge()) - .append("fGj", getfGj()) - .append("fNation", getfNation()) - .append("fCardId", getfCardId()) - .append("homeAddress", getHomeAddress()) - .append("momSign", getMomSign()) - .append("jsrySign", getJsrySign()) - .append("jsUnit", getJsUnit()) - .append("djType", getDjType()) - .append("picIds", getPicIds()) - .append("pictures", getPictures()) - .append("allPicIds", getAllPicIds()) - .append("allPics", getAllPics()) - .append("errorCorrect", getErrorCorrect()) - .append("auditStatus", getAuditStatus()) - .append("auditName", getAuditName()) - .append("auditResult", getAuditResult()) - .append("auditReason", getAuditReason()) - .append("remark", getRemark()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .toString(); + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("ywType", getYwType()) + .append("muId", getMuId()) + .append("muPath", getMuPath()) + .append("birthNum", getBirthNum()) + .append("name", getName()) + .append("birthday", getBirthday()) + .append("sex", getSex()) + .append("bornAddress", getBornAddress()) + .append("mName", getmName()) + .append("mAge", getmAge()) + .append("mGj", getmGj()) + .append("mNation", getmNation()) + .append("mCardId", getmCardId()) + .append("fName", getfName()) + .append("fAge", getfAge()) + .append("fGj", getfGj()) + .append("fNation", getfNation()) + .append("fCardId", getfCardId()) + .append("homeAddress", getHomeAddress()) + .append("momSign", getMomSign()) + .append("jsrySign", getJsrySign()) + .append("jsUnit", getJsUnit()) + .append("djType", getDjType()) + .append("picIds", getPicIds()) + .append("pictures", getPictures()) + .append("allPicIds", getAllPicIds()) + .append("allPics", getAllPics()) + .append("errorCorrect", getErrorCorrect()) + .append("auditStatus", getAuditStatus()) + .append("auditName", getAuditName()) + .append("auditResult", getAuditResult()) + .append("auditReason", getAuditReason()) + .append("remark", getRemark()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); } } diff --git a/dangan-dangan/src/main/java/com/da/dangan/domain/DaCzrkdj.java b/dangan-dangan/src/main/java/com/da/dangan/domain/DaCzrkdj.java index 31421c3..3e56ad5 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/domain/DaCzrkdj.java +++ b/dangan-dangan/src/main/java/com/da/dangan/domain/DaCzrkdj.java @@ -31,6 +31,18 @@ public class DaCzrkdj extends BaseEntity { @Excel(name = "目录id") private Long muId; + /** 档案目录路径 */ + @Excel(name = "档案目录路径") + private String muPath; + + public String getMuPath() { + return muPath; + } + + public void setMuPath(String muPath) { + this.muPath = muPath; + } + /** * 与户主关系 */ @@ -662,6 +674,7 @@ public class DaCzrkdj extends BaseEntity { .append("id", getId()) .append("ywType", getYwType()) .append("muId", getMuId()) + .append("muPath", getMuPath()) .append("relation", getRelation()) .append("name", getName()) .append("otherName", getOtherName()) diff --git a/dangan-dangan/src/main/java/com/da/dangan/domain/DaQyz.java b/dangan-dangan/src/main/java/com/da/dangan/domain/DaQyz.java index b517c78..f08a852 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/domain/DaQyz.java +++ b/dangan-dangan/src/main/java/com/da/dangan/domain/DaQyz.java @@ -7,470 +7,515 @@ import com.da.common.core.domain.BaseEntity; /** * 迁移证对象 da_qyz - * + * * @author hs * @date 2024-06-14 */ -public class DaQyz extends BaseEntity -{ +public class DaQyz extends BaseEntity { private static final long serialVersionUID = 1L; - /** id */ + /** + * id + */ private Long id; - /** 业务类型(字典) */ - @Excel(name = "业务类型",dictType = "yw_type") + /** + * 业务类型(字典) + */ + @Excel(name = "业务类型", dictType = "yw_type") private String ywType; - /** 目录id */ + /** + * 目录id + */ @Excel(name = "目录id") private Long muId; - /** 发文单位 */ + /** + * 档案目录路径 + */ + @Excel(name = "档案目录路径") + private String muPath; + + public String getMuPath() { + return muPath; + } + + public void setMuPath(String muPath) { + this.muPath = muPath; + } + + /** + * 发文单位 + */ @Excel(name = "发文单位") private String fwUnit; - /** 文件序号 */ + /** + * 文件序号 + */ @Excel(name = "文件序号") private String wjXh; - /** 姓名1 */ + /** + * 姓名1 + */ @Excel(name = "姓名1") private String name1; - /** 性别1 */ + /** + * 性别1 + */ @Excel(name = "性别1") private String sex1; - /** 居民身份证编号1 */ + /** + * 居民身份证编号1 + */ @Excel(name = "居民身份证编号1") private String cardId1; - /** 姓名2 */ + /** + * 姓名2 + */ @Excel(name = "姓名2") private String name2; - /** 性别2 */ + /** + * 性别2 + */ @Excel(name = "性别2") private String sex2; - /** 居民身份证编号2 */ + /** + * 居民身份证编号2 + */ @Excel(name = "居民身份证编号2") private String cardId2; - /** 姓名3 */ + /** + * 姓名3 + */ @Excel(name = "姓名3") private String name3; - /** 性别3 */ + /** + * 性别3 + */ @Excel(name = "性别3") private String sex3; - /** 居民身份证编号3 */ + /** + * 居民身份证编号3 + */ @Excel(name = "居民身份证编号3") private String cardId3; - /** 姓名4 */ + /** + * 姓名4 + */ @Excel(name = "姓名4") private String name4; - /** 性别4 */ + /** + * 性别4 + */ @Excel(name = "性别4") private String sex4; - /** 居民身份证编号4 */ + /** + * 居民身份证编号4 + */ @Excel(name = "居民身份证编号4") private String cardId4; - /** 迁移原因 */ + /** + * 迁移原因 + */ @Excel(name = "迁移原因") private String qyReason; - /** 原住址 */ + /** + * 原住址 + */ @Excel(name = "原住址") private String yAddress; - /** 迁往地址 */ + /** + * 迁往地址 + */ @Excel(name = "迁往地址") private String qwAddress; - /** 签发有效时间起 */ + /** + * 签发有效时间起 + */ @Excel(name = "签发有效时间起") private String sDate; - /** 签发有效时间止 */ + /** + * 签发有效时间止 + */ @Excel(name = "签发有效时间止") private String eDate; - /** 承办人 */ + /** + * 承办人 + */ @Excel(name = "承办人") private String cbr; - /** 识别图片id */ + /** + * 识别图片id + */ @Excel(name = "识别图片id") private String picIds; - /** 识别图片 */ + /** + * 识别图片 + */ @Excel(name = "识别图片") private String pictures; - /** 相关图片id */ + /** + * 相关图片id + */ @Excel(name = "相关图片id") private String allPicIds; - /** 相关图片 */ + /** + * 相关图片 + */ @Excel(name = "相关图片") private String allPics; - /** 是否纠错(字典0否1是) */ - @Excel(name = "是否纠错",dictType = "error_correct") + /** + * 是否纠错(字典0否1是) + */ + @Excel(name = "是否纠错", dictType = "error_correct") private String errorCorrect; - /** 审核状态(字典) */ - @Excel(name = "审核状态",dictType = "audit_status") + /** + * 审核状态(字典) + */ + @Excel(name = "审核状态", dictType = "audit_status") private String auditStatus; - /** 审核人 */ + /** + * 审核人 + */ @Excel(name = "审核人") private String auditName; - /** 审核结果 */ + /** + * 审核结果 + */ @Excel(name = "审核结果") private String auditResult; - /** 审核原由 */ + /** + * 审核原由 + */ @Excel(name = "审核原由") private String auditReason; - public void setId(Long id) - { + public void setId(Long id) { this.id = id; } - public Long getId() - { + public Long getId() { return id; } - public void setYwType(String ywType) - { + + public void setYwType(String ywType) { this.ywType = ywType; } - public String getYwType() - { + public String getYwType() { return ywType; } - public void setMuId(Long muId) - { + + public void setMuId(Long muId) { this.muId = muId; } - public Long getMuId() - { + public Long getMuId() { return muId; } - public void setFwUnit(String fwUnit) - { + + public void setFwUnit(String fwUnit) { this.fwUnit = fwUnit; } - public String getFwUnit() - { + public String getFwUnit() { return fwUnit; } - public void setWjXh(String wjXh) - { + + public void setWjXh(String wjXh) { this.wjXh = wjXh; } - public String getWjXh() - { + public String getWjXh() { return wjXh; } - public void setName1(String name1) - { + + public void setName1(String name1) { this.name1 = name1; } - public String getName1() - { + public String getName1() { return name1; } - public void setSex1(String sex1) - { + + public void setSex1(String sex1) { this.sex1 = sex1; } - public String getSex1() - { + public String getSex1() { return sex1; } - public void setCardId1(String cardId1) - { + + public void setCardId1(String cardId1) { this.cardId1 = cardId1; } - public String getCardId1() - { + public String getCardId1() { return cardId1; } - public void setName2(String name2) - { + + public void setName2(String name2) { this.name2 = name2; } - public String getName2() - { + public String getName2() { return name2; } - public void setSex2(String sex2) - { + + public void setSex2(String sex2) { this.sex2 = sex2; } - public String getSex2() - { + public String getSex2() { return sex2; } - public void setCardId2(String cardId2) - { + + public void setCardId2(String cardId2) { this.cardId2 = cardId2; } - public String getCardId2() - { + public String getCardId2() { return cardId2; } - public void setName3(String name3) - { + + public void setName3(String name3) { this.name3 = name3; } - public String getName3() - { + public String getName3() { return name3; } - public void setSex3(String sex3) - { + + public void setSex3(String sex3) { this.sex3 = sex3; } - public String getSex3() - { + public String getSex3() { return sex3; } - public void setCardId3(String cardId3) - { + + public void setCardId3(String cardId3) { this.cardId3 = cardId3; } - public String getCardId3() - { + public String getCardId3() { return cardId3; } - public void setName4(String name4) - { + + public void setName4(String name4) { this.name4 = name4; } - public String getName4() - { + public String getName4() { return name4; } - public void setSex4(String sex4) - { + + public void setSex4(String sex4) { this.sex4 = sex4; } - public String getSex4() - { + public String getSex4() { return sex4; } - public void setCardId4(String cardId4) - { + + public void setCardId4(String cardId4) { this.cardId4 = cardId4; } - public String getCardId4() - { + public String getCardId4() { return cardId4; } - public void setQyReason(String qyReason) - { + + public void setQyReason(String qyReason) { this.qyReason = qyReason; } - public String getQyReason() - { + public String getQyReason() { return qyReason; } - public void setyAddress(String yAddress) - { + + public void setyAddress(String yAddress) { this.yAddress = yAddress; } - public String getyAddress() - { + public String getyAddress() { return yAddress; } - public void setQwAddress(String qwAddress) - { + + public void setQwAddress(String qwAddress) { this.qwAddress = qwAddress; } - public String getQwAddress() - { + public String getQwAddress() { return qwAddress; } - public void setsDate(String sDate) - { + + public void setsDate(String sDate) { this.sDate = sDate; } - public String getsDate() - { + public String getsDate() { return sDate; } - public void seteDate(String eDate) - { + + public void seteDate(String eDate) { this.eDate = eDate; } - public String geteDate() - { + public String geteDate() { return eDate; } - public void setCbr(String cbr) - { + + public void setCbr(String cbr) { this.cbr = cbr; } - public String getCbr() - { + public String getCbr() { return cbr; } - public void setPicIds(String picIds) - { + + public void setPicIds(String picIds) { this.picIds = picIds; } - public String getPicIds() - { + public String getPicIds() { return picIds; } - public void setPictures(String pictures) - { + + public void setPictures(String pictures) { this.pictures = pictures; } - public String getPictures() - { + public String getPictures() { return pictures; } - public void setAllPicIds(String allPicIds) - { + + public void setAllPicIds(String allPicIds) { this.allPicIds = allPicIds; } - public String getAllPicIds() - { + public String getAllPicIds() { return allPicIds; } - public void setAllPics(String allPics) - { + + public void setAllPics(String allPics) { this.allPics = allPics; } - public String getAllPics() - { + public String getAllPics() { return allPics; } - public void setErrorCorrect(String errorCorrect) - { + + public void setErrorCorrect(String errorCorrect) { this.errorCorrect = errorCorrect; } - public String getErrorCorrect() - { + public String getErrorCorrect() { return errorCorrect; } - public void setAuditStatus(String auditStatus) - { + + public void setAuditStatus(String auditStatus) { this.auditStatus = auditStatus; } - public String getAuditStatus() - { + public String getAuditStatus() { return auditStatus; } - public void setAuditName(String auditName) - { + + public void setAuditName(String auditName) { this.auditName = auditName; } - public String getAuditName() - { + public String getAuditName() { return auditName; } - public void setAuditResult(String auditResult) - { + + public void setAuditResult(String auditResult) { this.auditResult = auditResult; } - public String getAuditResult() - { + public String getAuditResult() { return auditResult; } - public void setAuditReason(String auditReason) - { + + public void setAuditReason(String auditReason) { this.auditReason = auditReason; } - public String getAuditReason() - { + public String getAuditReason() { return auditReason; } @Override public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("ywType", getYwType()) - .append("muId", getMuId()) - .append("fwUnit", getFwUnit()) - .append("wjXh", getWjXh()) - .append("name1", getName1()) - .append("sex1", getSex1()) - .append("cardId1", getCardId1()) - .append("name2", getName2()) - .append("sex2", getSex2()) - .append("cardId2", getCardId2()) - .append("name3", getName3()) - .append("sex3", getSex3()) - .append("cardId3", getCardId3()) - .append("name4", getName4()) - .append("sex4", getSex4()) - .append("cardId4", getCardId4()) - .append("qyReason", getQyReason()) - .append("yAddress", getyAddress()) - .append("qwAddress", getQwAddress()) - .append("sDate", getsDate()) - .append("eDate", geteDate()) - .append("cbr", getCbr()) - .append("picIds", getPicIds()) - .append("pictures", getPictures()) - .append("allPicIds", getAllPicIds()) - .append("allPics", getAllPics()) - .append("errorCorrect", getErrorCorrect()) - .append("auditStatus", getAuditStatus()) - .append("auditName", getAuditName()) - .append("auditResult", getAuditResult()) - .append("auditReason", getAuditReason()) - .append("remark", getRemark()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .toString(); + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("ywType", getYwType()) + .append("muId", getMuId()) + .append("muPath", getMuPath()) + .append("fwUnit", getFwUnit()) + .append("wjXh", getWjXh()) + .append("name1", getName1()) + .append("sex1", getSex1()) + .append("cardId1", getCardId1()) + .append("name2", getName2()) + .append("sex2", getSex2()) + .append("cardId2", getCardId2()) + .append("name3", getName3()) + .append("sex3", getSex3()) + .append("cardId3", getCardId3()) + .append("name4", getName4()) + .append("sex4", getSex4()) + .append("cardId4", getCardId4()) + .append("qyReason", getQyReason()) + .append("yAddress", getyAddress()) + .append("qwAddress", getQwAddress()) + .append("sDate", getsDate()) + .append("eDate", geteDate()) + .append("cbr", getCbr()) + .append("picIds", getPicIds()) + .append("pictures", getPictures()) + .append("allPicIds", getAllPicIds()) + .append("allPics", getAllPics()) + .append("errorCorrect", getErrorCorrect()) + .append("auditStatus", getAuditStatus()) + .append("auditName", getAuditName()) + .append("auditResult", getAuditResult()) + .append("auditReason", getAuditReason()) + .append("remark", getRemark()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); } } diff --git a/dangan-dangan/src/main/java/com/da/dangan/domain/DaTask.java b/dangan-dangan/src/main/java/com/da/dangan/domain/DaTask.java index 6beca12..673f8a2 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/domain/DaTask.java +++ b/dangan-dangan/src/main/java/com/da/dangan/domain/DaTask.java @@ -18,10 +18,26 @@ public class DaTask extends BaseEntity /** 任务id */ private Long id; - /** 总数量 */ - @Excel(name = "总数量") + /** 目录id */ + @Excel(name = "目录id") + private Long muId; + + /** 业务类型 */ + @Excel(name = "业务类型") + private String ywType; + + /** 任务图片ids */ + @Excel(name = "任务图片ids") + private String picIds; + + /** 任务数量 */ + @Excel(name = "任务数量") private Long num; + /** 档案目录路径 */ + @Excel(name = "档案目录路径") + private String muPath; + /** 任务状态(字典) */ @Excel(name = "任务状态(字典)") private String status; @@ -30,13 +46,17 @@ public class DaTask extends BaseEntity @Excel(name = "成功") private Long successNum; + /** 任务图片ids */ + @Excel(name = "任务图片ids") + private String successIds; + /** 失败 */ @Excel(name = "失败") private Long failNum; - /** 相关图片ids */ - @Excel(name = "相关图片ids") - private String picIds; + /** 任务图片ids */ + @Excel(name = "任务图片ids") + private String failIds; public void setId(Long id) { @@ -47,6 +67,33 @@ public class DaTask extends BaseEntity { return id; } + public void setMuId(Long muId) + { + this.muId = muId; + } + + public Long getMuId() + { + return muId; + } + public void setYwType(String ywType) + { + this.ywType = ywType; + } + + public String getYwType() + { + return ywType; + } + public void setPicIds(String picIds) + { + this.picIds = picIds; + } + + public String getPicIds() + { + return picIds; + } public void setNum(Long num) { this.num = num; @@ -56,6 +103,15 @@ public class DaTask extends BaseEntity { return num; } + public void setMuPath(String muPath) + { + this.muPath = muPath; + } + + public String getMuPath() + { + return muPath; + } public void setStatus(String status) { this.status = status; @@ -74,6 +130,15 @@ public class DaTask extends BaseEntity { return successNum; } + public void setSuccessIds(String successIds) + { + this.successIds = successIds; + } + + public String getSuccessIds() + { + return successIds; + } public void setFailNum(Long failNum) { this.failNum = failNum; @@ -83,25 +148,30 @@ public class DaTask extends BaseEntity { return failNum; } - public void setPicIds(String picIds) + public void setFailIds(String failIds) { - this.picIds = picIds; + this.failIds = failIds; } - public String getPicIds() + public String getFailIds() { - return picIds; + return failIds; } @Override public String toString() { 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("status", getStatus()) .append("successNum", getSuccessNum()) + .append("successIds", getSuccessIds()) .append("failNum", getFailNum()) - .append("picIds", getPicIds()) + .append("failIds", getFailIds()) .append("remark", getRemark()) .append("createBy", getCreateBy()) .append("createTime", getCreateTime()) diff --git a/dangan-dangan/src/main/java/com/da/dangan/domain/DaYtzm.java b/dangan-dangan/src/main/java/com/da/dangan/domain/DaYtzm.java index 2c07580..47f21ff 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/domain/DaYtzm.java +++ b/dangan-dangan/src/main/java/com/da/dangan/domain/DaYtzm.java @@ -31,12 +31,24 @@ public class DaYtzm extends BaseEntity { @Excel(name = "目录id") private Long muId; + /** 档案目录路径 */ + @Excel(name = "档案目录路径") + private String muPath; + /** * 年份 */ @Excel(name = "年份") private String year; + public String getMuPath() { + return muPath; + } + + public void setMuPath(String muPath) { + this.muPath = muPath; + } + /** * 序号 */ @@ -413,6 +425,7 @@ public class DaYtzm extends BaseEntity { .append("id", getId()) .append("ywType", getYwType()) .append("muId", getMuId()) + .append("muPath", getMuPath()) .append("year", getYear()) .append("xh", getXh()) .append("wName", getwName()) diff --git a/dangan-dangan/src/main/java/com/da/dangan/domain/DaZfnyhkcg.java b/dangan-dangan/src/main/java/com/da/dangan/domain/DaZfnyhkcg.java index f9e144c..add1370 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/domain/DaZfnyhkcg.java +++ b/dangan-dangan/src/main/java/com/da/dangan/domain/DaZfnyhkcg.java @@ -7,367 +7,423 @@ import org.apache.commons.lang3.builder.ToStringStyle; /** * 转非农业人口批复存根对象 da_zfnyhkcg - * + * * @author hs * @date 2024-06-14 */ -public class DaZfnyhkcg extends BaseEntity -{ +public class DaZfnyhkcg extends BaseEntity { private static final long serialVersionUID = 1L; - /** id */ + /** + * id + */ private Long id; - /** 业务类型(字典) */ - @Excel(name = "业务类型",dictType = "yw_type") + /** + * 业务类型(字典) + */ + @Excel(name = "业务类型", dictType = "yw_type") private String ywType; - /** 目录id */ + /** + * 目录id + */ @Excel(name = "目录id") private Long muId; - /** 编号 */ + public String getMuPath() { + return muPath; + } + + public void setMuPath(String muPath) { + this.muPath = muPath; + } + + /** + * 档案目录路径 + */ + @Excel(name = "档案目录路径") + private String muPath; + + /** + * 编号 + */ @Excel(name = "编号") private String num; - /** 申请人姓名 */ + /** + * 申请人姓名 + */ @Excel(name = "申请人姓名") private String name; - /** 住址 */ + /** + * 住址 + */ @Excel(name = "住址") private String address; - /** 与申请人关系1 */ + /** + * 与申请人关系1 + */ @Excel(name = "与申请人关系1") private String relation1; - /** 姓名1 */ + /** + * 姓名1 + */ @Excel(name = "姓名1") private String name1; - /** 性别1 */ + /** + * 性别1 + */ @Excel(name = "性别1") private String sex1; - /** 与申请人关系2 */ + /** + * 与申请人关系2 + */ @Excel(name = "与申请人关系2") private String relation2; - /** 姓名2 */ + /** + * 姓名2 + */ @Excel(name = "姓名2") private String name2; - /** 性别2 */ + /** + * 性别2 + */ @Excel(name = "性别2") private String sex2; - /** 与申请人关系3 */ + /** + * 与申请人关系3 + */ @Excel(name = "与申请人关系3") private String relation3; - /** 姓名3 */ + /** + * 姓名3 + */ @Excel(name = "姓名3") private String name3; - /** 性别3 */ + /** + * 性别3 + */ @Excel(name = "性别3") private String sex3; - /** 与申请人关系4 */ + /** + * 与申请人关系4 + */ @Excel(name = "与申请人关系4") private String relation4; - /** 姓名4 */ + /** + * 姓名4 + */ @Excel(name = "姓名4") private String name4; - /** 性别4 */ + /** + * 性别4 + */ @Excel(name = "性别4") private String sex4; - /** 与申请人关系5 */ + /** + * 与申请人关系5 + */ @Excel(name = "与申请人关系5") private String relation5; - /** 姓名5 */ + /** + * 姓名5 + */ @Excel(name = "姓名5") private String name5; - /** 性别5 */ + /** + * 性别5 + */ @Excel(name = "性别5") private String sex5; - /** 机关 1 */ + /** + * 机关 1 + */ @Excel(name = "机关 1") private String jg1; - /** 机关 2 */ + /** + * 机关 2 + */ @Excel(name = "机关 2") private String jg2; - /** 承办人 */ + /** + * 承办人 + */ @Excel(name = "承办人") private String cbr; - /** 承办日期 */ + /** + * 承办日期 + */ @Excel(name = "承办日期") private String cbDate; - /** 识别图片id */ + /** + * 识别图片id + */ @Excel(name = "识别图片id") private String picIds; - /** 识别图片 */ + /** + * 识别图片 + */ @Excel(name = "识别图片") private String pictures; - /** 相关图片id */ + /** + * 相关图片id + */ @Excel(name = "相关图片id") private String allPicIds; - /** 相关图片 */ + /** + * 相关图片 + */ @Excel(name = "相关图片") private String allPics; - /** 是否纠错(字典0否1是) */ - @Excel(name = "是否纠错",dictType = "error_correct") + /** + * 是否纠错(字典0否1是) + */ + @Excel(name = "是否纠错", dictType = "error_correct") private String errorCorrect; - /** 审核状态(字典) */ - @Excel(name = "审核状态",dictType = "audit_status") + /** + * 审核状态(字典) + */ + @Excel(name = "审核状态", dictType = "audit_status") private String auditStatus; - /** 审核人 */ + /** + * 审核人 + */ @Excel(name = "审核人") private String auditName; - /** 审核结果 */ + /** + * 审核结果 + */ @Excel(name = "审核结果") private String auditResult; - /** 审核原由 */ + /** + * 审核原由 + */ @Excel(name = "审核原由") private String auditReason; - public void setId(Long id) - { + public void setId(Long id) { this.id = id; } - public Long getId() - { + public Long getId() { return id; } - public void setYwType(String ywType) - { + + public void setYwType(String ywType) { this.ywType = ywType; } - public String getYwType() - { + public String getYwType() { return ywType; } - public void setMuId(Long muId) - { + + public void setMuId(Long muId) { this.muId = muId; } - public Long getMuId() - { + public Long getMuId() { return muId; } - public void setNum(String num) - { + + public void setNum(String num) { this.num = num; } - public String getNum() - { + public String getNum() { return num; } - public void setName(String name) - { + + public void setName(String name) { this.name = name; } - public String getName() - { + public String getName() { return name; } - public void setAddress(String address) - { + + public void setAddress(String address) { this.address = address; } - public String getAddress() - { + public String getAddress() { return address; } - public void setRelation1(String relation1) - { + + public void setRelation1(String relation1) { this.relation1 = relation1; } - public String getRelation1() - { + public String getRelation1() { return relation1; } - public void setName1(String name1) - { + + public void setName1(String name1) { this.name1 = name1; } - public String getName1() - { + public String getName1() { return name1; } - public void setSex1(String sex1) - { + + public void setSex1(String sex1) { this.sex1 = sex1; } - public String getSex1() - { + public String getSex1() { return sex1; } - public void setRelation2(String relation2) - { + + public void setRelation2(String relation2) { this.relation2 = relation2; } - public String getRelation2() - { + public String getRelation2() { return relation2; } - public void setName2(String name2) - { + + public void setName2(String name2) { this.name2 = name2; } - public String getName2() - { + public String getName2() { return name2; } - public void setSex2(String sex2) - { + + public void setSex2(String sex2) { this.sex2 = sex2; } - public String getSex2() - { + public String getSex2() { return sex2; } - public void setRelation3(String relation3) - { + + public void setRelation3(String relation3) { this.relation3 = relation3; } - public String getRelation3() - { + public String getRelation3() { return relation3; } - public void setName3(String name3) - { + + public void setName3(String name3) { this.name3 = name3; } - public String getName3() - { + public String getName3() { return name3; } - public void setSex3(String sex3) - { + + public void setSex3(String sex3) { this.sex3 = sex3; } - public String getSex3() - { + public String getSex3() { return sex3; } - public void setRelation4(String relation4) - { + + public void setRelation4(String relation4) { this.relation4 = relation4; } - public String getRelation4() - { + public String getRelation4() { return relation4; } - public void setName4(String name4) - { + + public void setName4(String name4) { this.name4 = name4; } - public String getName4() - { + public String getName4() { return name4; } - public void setSex4(String sex4) - { + + public void setSex4(String sex4) { this.sex4 = sex4; } - public String getSex4() - { + public String getSex4() { return sex4; } - public void setRelation5(String relation5) - { + + public void setRelation5(String relation5) { this.relation5 = relation5; } - public String getRelation5() - { + public String getRelation5() { return relation5; } - public void setName5(String name5) - { + + public void setName5(String name5) { this.name5 = name5; } - public String getName5() - { + public String getName5() { return name5; } - public void setSex5(String sex5) - { + + public void setSex5(String sex5) { this.sex5 = sex5; } - public String getSex5() - { + public String getSex5() { return sex5; } - public void setJg1(String jg1) - { + + public void setJg1(String jg1) { this.jg1 = jg1; } - public String getJg1() - { + public String getJg1() { return jg1; } - public void setJg2(String jg2) - { + + public void setJg2(String jg2) { this.jg2 = jg2; } - public String getJg2() - { + public String getJg2() { return jg2; } - public void setCbr(String cbr) - { + + public void setCbr(String cbr) { this.cbr = cbr; } - public String getCbr() - { + public String getCbr() { return cbr; } - public void setPicIds(String picIds) - { + + public void setPicIds(String picIds) { this.picIds = picIds; } @@ -379,125 +435,117 @@ public class DaZfnyhkcg extends BaseEntity this.cbDate = cbDate; } - public String getPicIds() - { + public String getPicIds() { return picIds; } - public void setPictures(String pictures) - { + + public void setPictures(String pictures) { this.pictures = pictures; } - public String getPictures() - { + public String getPictures() { return pictures; } - public void setAllPicIds(String allPicIds) - { + + public void setAllPicIds(String allPicIds) { this.allPicIds = allPicIds; } - public String getAllPicIds() - { + public String getAllPicIds() { return allPicIds; } - public void setAllPics(String allPics) - { + + public void setAllPics(String allPics) { this.allPics = allPics; } - public String getAllPics() - { + public String getAllPics() { return allPics; } - public void setErrorCorrect(String errorCorrect) - { + + public void setErrorCorrect(String errorCorrect) { this.errorCorrect = errorCorrect; } - public String getErrorCorrect() - { + public String getErrorCorrect() { return errorCorrect; } - public void setAuditStatus(String auditStatus) - { + + public void setAuditStatus(String auditStatus) { this.auditStatus = auditStatus; } - public String getAuditStatus() - { + public String getAuditStatus() { return auditStatus; } - public void setAuditName(String auditName) - { + + public void setAuditName(String auditName) { this.auditName = auditName; } - public String getAuditName() - { + public String getAuditName() { return auditName; } - public void setAuditResult(String auditResult) - { + + public void setAuditResult(String auditResult) { this.auditResult = auditResult; } - public String getAuditResult() - { + public String getAuditResult() { return auditResult; } - public void setAuditReason(String auditReason) - { + + public void setAuditReason(String auditReason) { this.auditReason = auditReason; } - public String getAuditReason() - { + public String getAuditReason() { return auditReason; } @Override public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("ywType", getYwType()) - .append("muId", getMuId()) - .append("num", getNum()) - .append("name", getName()) - .append("address", getAddress()) - .append("relation1", getRelation1()) - .append("name1", getName1()) - .append("sex1", getSex1()) - .append("relation2", getRelation2()) - .append("name2", getName2()) - .append("sex2", getSex2()) - .append("relation3", getRelation3()) - .append("name3", getName3()) - .append("sex3", getSex3()) - .append("relation4", getRelation4()) - .append("name4", getName4()) - .append("sex4", getSex4()) - .append("relation5", getRelation5()) - .append("name5", getName5()) - .append("sex5", getSex5()) - .append("jg1", getJg1()) - .append("jg2", getJg2()) - .append("cbr", getCbr()) - .append("cbDate", getCbDate()) - .append("picIds", getPicIds()) - .append("pictures", getPictures()) - .append("allPicIds", getAllPicIds()) - .append("allPics", getAllPics()) - .append("errorCorrect", getErrorCorrect()) - .append("auditStatus", getAuditStatus()) - .append("auditName", getAuditName()) - .append("auditResult", getAuditResult()) - .append("auditReason", getAuditReason()) - .append("remark", getRemark()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .toString(); + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("ywType", getYwType()) + .append("muId", getMuId()) + .append("muPath", getMuPath()) + .append("num", getNum()) + .append("name", getName()) + .append("address", getAddress()) + .append("relation1", getRelation1()) + .append("name1", getName1()) + .append("sex1", getSex1()) + .append("relation2", getRelation2()) + .append("name2", getName2()) + .append("sex2", getSex2()) + .append("relation3", getRelation3()) + .append("name3", getName3()) + .append("sex3", getSex3()) + .append("relation4", getRelation4()) + .append("name4", getName4()) + .append("sex4", getSex4()) + .append("relation5", getRelation5()) + .append("name5", getName5()) + .append("sex5", getSex5()) + .append("jg1", getJg1()) + .append("jg2", getJg2()) + .append("cbr", getCbr()) + .append("cbDate", getCbDate()) + .append("picIds", getPicIds()) + .append("pictures", getPictures()) + .append("allPicIds", getAllPicIds()) + .append("allPics", getAllPics()) + .append("errorCorrect", getErrorCorrect()) + .append("auditStatus", getAuditStatus()) + .append("auditName", getAuditName()) + .append("auditResult", getAuditResult()) + .append("auditReason", getAuditReason()) + .append("remark", getRemark()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); } } diff --git a/dangan-dangan/src/main/java/com/da/dangan/domain/DaZqz.java b/dangan-dangan/src/main/java/com/da/dangan/domain/DaZqz.java index f70472f..2e2f6a9 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/domain/DaZqz.java +++ b/dangan-dangan/src/main/java/com/da/dangan/domain/DaZqz.java @@ -26,6 +26,18 @@ public class DaZqz extends BaseEntity @Excel(name = "目录id") private Long muId; + /** 档案目录路径 */ + @Excel(name = "档案目录路径") + private String muPath; + + public String getMuPath() { + return muPath; + } + + public void setMuPath(String muPath) { + this.muPath = muPath; + } + /** 编号 */ @Excel(name = "编号") private String num; @@ -580,6 +592,7 @@ public class DaZqz extends BaseEntity .append("id", getId()) .append("ywType", getYwType()) .append("muId", getMuId()) + .append("muPath", getMuPath()) .append("num", getNum()) .append("name", getName()) .append("cardId", getCardId()) diff --git a/dangan-dangan/src/main/resources/mapper/dangan/DaBirthDjMapper.xml b/dangan-dangan/src/main/resources/mapper/dangan/DaBirthDjMapper.xml index 3c10c75..750b9f6 100644 --- a/dangan-dangan/src/main/resources/mapper/dangan/DaBirthDjMapper.xml +++ b/dangan-dangan/src/main/resources/mapper/dangan/DaBirthDjMapper.xml @@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -44,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, yw_type, mu_id, 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, 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 @@ -66,6 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and yw_type = #{ywType} and mu_id = #{muId} + and mu_path = #{muPath} and relation = #{relation} and ( name like concat('%', #{name}, '%') @@ -123,6 +125,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and yw_type = #{ywType} and mu_id = #{muId} + and mu_path = #{muPath} and ( name like concat('%', #{name}, '%') or hz_name like concat('%', #{name}, '%') @@ -184,6 +187,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" yw_type, mu_id, + mu_path, relation, name, other_name, @@ -236,6 +240,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{ywType}, #{muId}, + #{muPath}, #{relation}, #{name}, #{otherName}, @@ -292,6 +297,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" yw_type = #{ywType}, mu_id = #{muId}, + mu_path = #{muPath}, relation = #{relation}, name = #{name}, other_name = #{otherName}, diff --git a/dangan-dangan/src/main/resources/mapper/dangan/DaQyzMapper.xml b/dangan-dangan/src/main/resources/mapper/dangan/DaQyzMapper.xml index e885a7f..2de85fd 100644 --- a/dangan-dangan/src/main/resources/mapper/dangan/DaQyzMapper.xml +++ b/dangan-dangan/src/main/resources/mapper/dangan/DaQyzMapper.xml @@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -45,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, yw_type, mu_id, 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, 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 - + + and mu_id = #{muId} + and yw_type = #{ywType} + and pic_ids = #{picIds} and num = #{num} + and mu_path = #{muPath} and status = #{status} and success_num = #{successNum} + and success_ids = #{successIds} and fail_num = #{failNum} - and pic_ids = #{picIds} + and fail_ids = #{failIds} - + - + insert into da_task + mu_id, + yw_type, + pic_ids, num, + mu_path, status, success_num, + success_ids, fail_num, - pic_ids, + fail_ids, remark, create_by, create_time, update_by, update_time, - + + #{muId}, + #{ywType}, + #{picIds}, #{num}, + #{muPath}, #{status}, #{successNum}, + #{successIds}, #{failNum}, - #{picIds}, + #{failIds}, #{remark}, #{createBy}, #{createTime}, #{updateBy}, #{updateTime}, - + update da_task + mu_id = #{muId}, + yw_type = #{ywType}, + pic_ids = #{picIds}, num = #{num}, + mu_path = #{muPath}, status = #{status}, success_num = #{successNum}, + success_ids = #{successIds}, fail_num = #{failNum}, - pic_ids = #{picIds}, + fail_ids = #{failIds}, remark = #{remark}, create_by = #{createBy}, create_time = #{createTime}, @@ -88,7 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from da_task where id in + delete from da_task where id in #{id} diff --git a/dangan-dangan/src/main/resources/mapper/dangan/DaYtzmMapper.xml b/dangan-dangan/src/main/resources/mapper/dangan/DaYtzmMapper.xml index 517e5e6..90de7b4 100644 --- a/dangan-dangan/src/main/resources/mapper/dangan/DaYtzmMapper.xml +++ b/dangan-dangan/src/main/resources/mapper/dangan/DaYtzmMapper.xml @@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -41,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, yw_type, mu_id, 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, 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 @@ -55,6 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and yw_type = #{ywType} and mu_id = #{muId} + and mu_path = #{muPath} and num = #{num} and ( name like concat('%', #{name}, '%') @@ -108,6 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" yw_type, mu_id, + mu_path, num, name, address, @@ -148,6 +151,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{ywType}, #{muId}, + #{muPath}, #{num}, #{name}, #{address}, @@ -192,6 +196,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" yw_type = #{ywType}, mu_id = #{muId}, + mu_path = #{muPath}, num = #{num}, name = #{name}, address = #{address}, diff --git a/dangan-dangan/src/main/resources/mapper/dangan/DaZqzMapper.xml b/dangan-dangan/src/main/resources/mapper/dangan/DaZqzMapper.xml index a65ef1b..e5e2396 100644 --- a/dangan-dangan/src/main/resources/mapper/dangan/DaZqzMapper.xml +++ b/dangan-dangan/src/main/resources/mapper/dangan/DaZqzMapper.xml @@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -56,7 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, yw_type, mu_id, num, name, card_id, address, dj_jg, relation1, name1, sex1, birth_date1, card_id1, relation2, name2, sex2, birth_date2, card_id2, relation3, name3, birth_date3, sex3, 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, 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