档案合集添加档案路径字段

master
hansha 2 years ago
parent fda6c25aab
commit d8ac896aaa

@ -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));
}

@ -130,6 +130,7 @@ public class DangAnCollectController extends BaseController {
List<Long> 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<File> 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<Double> getProgress() {

@ -11,180 +11,251 @@ import org.apache.commons.lang3.builder.ToStringStyle;
* @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 = "出生登记类型(字典)")
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")
/**
* (01)
*/
@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,247 +267,221 @@ 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)
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())

@ -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())

@ -11,432 +11,477 @@ import com.da.common.core.domain.BaseEntity;
* @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")
/**
* (01)
*/
@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)
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())

@ -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())

@ -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())

@ -11,363 +11,419 @@ import org.apache.commons.lang3.builder.ToStringStyle;
* @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")
/**
* (01)
*/
@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,89 +435,81 @@ 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)
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())

@ -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())

@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="id" column="id" />
<result property="ywType" column="yw_type" />
<result property="muId" column="mu_id" />
<result property="muPath" column="mu_path" />
<result property="birthNum" column="birth_num" />
<result property="name" column="name" />
<result property="birthday" column="birthday" />
@ -44,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectDaBirthDjVo">
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
</sql>
<select id="selectDaBirthDjList" parameterType="DaBirthDj" resultMap="DaBirthDjResult">
@ -52,6 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<where>
<if test="ywType != null and ywType != ''"> and yw_type = #{ywType}</if>
<if test="muId != null "> and mu_id = #{muId}</if>
<if test="muPath != null and muPath != ''"> and mu_path = #{muPath}</if>
<if test="birthNum != null and birthNum != ''"> and birth_num = #{birthNum}</if>
<if test="name != null and name != ''">
and (name like concat('%', #{name}, '%')
@ -100,6 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="ywType != null">yw_type,</if>
<if test="muId != null">mu_id,</if>
<if test="muPath != null">mu_path,</if>
<if test="birthNum != null">birth_num,</if>
<if test="name != null">name,</if>
<if test="birthday != null">birthday,</if>
@ -138,6 +141,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="ywType != null">#{ywType},</if>
<if test="muId != null">#{muId},</if>
<if test="muPath != null">#{muPath},</if>
<if test="birthNum != null">#{birthNum},</if>
<if test="name != null">#{name},</if>
<if test="birthday != null">#{birthday},</if>
@ -180,6 +184,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="SET" suffixOverrides=",">
<if test="ywType != null">yw_type = #{ywType},</if>
<if test="muId != null">mu_id = #{muId},</if>
<if test="muPath != null">mu_path = #{muPath},</if>
<if test="birthNum != null">birth_num = #{birthNum},</if>
<if test="name != null">name = #{name},</if>
<if test="birthday != null">birthday = #{birthday},</if>

@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="id" column="id" />
<result property="ywType" column="yw_type" />
<result property="muId" column="mu_id" />
<result property="muPath" column="mu_path" />
<result property="relation" column="relation" />
<result property="name" column="name" />
<result property="otherName" column="other_name" />
@ -58,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectDaCzrkdjVo">
select id, yw_type, mu_id, relation, name, other_name, sex, birthday, address, yj, nation, zjxy, whcd, hyzk, zyjfwcs, bxsqtzz, gmzdhhmqfjgjrq, hsyhdqlbxshsdjhk, hsybxshcqlhsdjhk, 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, yw_type, mu_id, mu_path, relation, name, other_name, sex, birthday, address, yj, nation, zjxy, whcd, hyzk, zyjfwcs, bxsqtzz, gmzdhhmqfjgjrq, hsyhdqlbxshsdjhk, hsybxshcqlhsdjhk, 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">
@ -66,6 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<where>
<if test="ywType != null and ywType != ''"> and yw_type = #{ywType}</if>
<if test="muId != null "> and mu_id = #{muId}</if>
<if test="muPath != null and muPath != ''"> and mu_path = #{muPath}</if>
<if test="relation != null and relation != ''"> and relation = #{relation}</if>
<if test="name != null and name != ''">
and ( name like concat('%', #{name}, '%')
@ -123,6 +125,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<where>
<if test="ywType != null and ywType != ''"> and yw_type = #{ywType}</if>
<if test="muId != null "> and mu_id = #{muId}</if>
<if test="muPath != null and muPath != ''"> and mu_path = #{muPath}</if>
<if test="name != null and name != ''">
and ( name like concat('%', #{name}, '%')
or hz_name like concat('%', #{name}, '%')
@ -184,6 +187,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="ywType != null">yw_type,</if>
<if test="muId != null">mu_id,</if>
<if test="muPath != null">mu_path,</if>
<if test="relation != null">relation,</if>
<if test="name != null">name,</if>
<if test="otherName != null">other_name,</if>
@ -236,6 +240,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="ywType != null">#{ywType},</if>
<if test="muId != null">#{muId},</if>
<if test="muPath != null">#{muPath},</if>
<if test="relation != null">#{relation},</if>
<if test="name != null">#{name},</if>
<if test="otherName != null">#{otherName},</if>
@ -292,6 +297,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="SET" suffixOverrides=",">
<if test="ywType != null">yw_type = #{ywType},</if>
<if test="muId != null">mu_id = #{muId},</if>
<if test="muPath != null">mu_path = #{muPath},</if>
<if test="relation != null">relation = #{relation},</if>
<if test="name != null">name = #{name},</if>
<if test="otherName != null">other_name = #{otherName},</if>

@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="id" column="id" />
<result property="ywType" column="yw_type" />
<result property="muId" column="mu_id" />
<result property="muPath" column="mu_path" />
<result property="fwUnit" column="fw_unit" />
<result property="wjXh" column="wj_xh" />
<result property="name1" column="name1" />
@ -45,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectDaQyzVo">
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
</sql>
<select id="selectDaQyzList" parameterType="DaQyz" resultMap="DaQyzResult">
@ -53,6 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<where>
<if test="ywType != null and ywType != ''"> and yw_type = #{ywType}</if>
<if test="muId != null "> and mu_id = #{muId}</if>
<if test="muPath != null and muPath != ''"> and mu_path = #{muPath}</if>
<if test="fwUnit != null and fwUnit != ''"> and fw_unit = #{fwUnit}</if>
<if test="wjXh != null and wjXh != ''"> and wj_xh = #{wjXh}</if>
<if test="name1 != null and name1 != ''">
@ -102,6 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="ywType != null">yw_type,</if>
<if test="muId != null">mu_id,</if>
<if test="muPath != null">mu_path,</if>
<if test="fwUnit != null">fw_unit,</if>
<if test="wjXh != null">wj_xh,</if>
<if test="name1 != null">name1,</if>
@ -140,6 +143,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="ywType != null">#{ywType},</if>
<if test="muId != null">#{muId},</if>
<if test="muPath != null">#{muPath},</if>
<if test="fwUnit != null">#{fwUnit},</if>
<if test="wjXh != null">#{wjXh},</if>
<if test="name1 != null">#{name1},</if>
@ -182,6 +186,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="SET" suffixOverrides=",">
<if test="ywType != null">yw_type = #{ywType},</if>
<if test="muId != null">mu_id = #{muId},</if>
<if test="muPath != null">mu_path = #{muPath},</if>
<if test="fwUnit != null">fw_unit = #{fwUnit},</if>
<if test="wjXh != null">wj_xh = #{wjXh},</if>
<if test="name1 != null">name1 = #{name1},</if>

@ -1,16 +1,21 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.da.dangan.mapper.DaTaskMapper">
<resultMap type="DaTask" id="DaTaskResult">
<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="status" column="status" />
<result property="successNum" column="success_num" />
<result property="successIds" column="success_ids" />
<result property="failNum" column="fail_num" />
<result property="picIds" column="pic_ids" />
<result property="failIds" column="fail_ids" />
<result property="remark" column="remark" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
@ -19,17 +24,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectDaTaskVo">
select id, num, status, success_num, fail_num, pic_ids, remark, create_by, create_time, update_by, update_time from da_task
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
</sql>
<select id="selectDaTaskList" parameterType="DaTask" resultMap="DaTaskResult">
<include refid="selectDaTaskVo"/>
<where>
<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="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="picIds != null and picIds != ''"> and pic_ids = #{picIds}</if>
<if test="failIds != null and failIds != ''"> and fail_ids = #{failIds}</if>
</where>
</select>
@ -41,11 +51,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<insert id="insertDaTask" parameterType="DaTask" useGeneratedKeys="true" keyProperty="id">
insert into da_task
<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="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="picIds != null">pic_ids,</if>
<if test="failIds != null">fail_ids,</if>
<if test="remark != null">remark,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
@ -53,11 +68,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateTime != null">update_time,</if>
</trim>
<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="status != null">#{status},</if>
<if test="successNum != null">#{successNum},</if>
<if test="successIds != null">#{successIds},</if>
<if test="failNum != null">#{failNum},</if>
<if test="picIds != null">#{picIds},</if>
<if test="failIds != null">#{failIds},</if>
<if test="remark != null">#{remark},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
@ -69,11 +89,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<update id="updateDaTask" parameterType="DaTask">
update da_task
<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="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="picIds != null">pic_ids = #{picIds},</if>
<if test="failIds != null">fail_ids = #{failIds},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>

@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="id" column="id" />
<result property="ywType" column="yw_type" />
<result property="muId" column="mu_id" />
<result property="muPath" column="mu_path" />
<result property="year" column="year" />
<result property="xh" column="xh" />
<result property="wName" column="w_name" />
@ -41,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectDaYtzmVo">
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
</sql>
<select id="selectDaYtzmList" parameterType="DaYtzm" resultMap="DaYtzmResult">
@ -49,6 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<where>
<if test="ywType != null and ywType != ''"> and yw_type = #{ywType}</if>
<if test="muId != null "> and mu_id = #{muId}</if>
<if test="muPath != null and muPath != ''"> and mu_path = #{muPath}</if>
<if test="year != null and year != ''"> and year = #{year}</if>
<if test="xh != null and xh != ''"> and xh = #{xh}</if>
<if test="wName != null and wName != ''">
@ -92,6 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="ywType != null">yw_type,</if>
<if test="muId != null">mu_id,</if>
<if test="muPath != null">mu_path,</if>
<if test="year != null">year,</if>
<if test="xh != null">xh,</if>
<if test="wName != null">w_name,</if>
@ -126,6 +129,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="ywType != null">#{ywType},</if>
<if test="muId != null">#{muId},</if>
<if test="muPath != null">#{muPath},</if>
<if test="year != null">#{year},</if>
<if test="xh != null">#{xh},</if>
<if test="wName != null">#{wName},</if>
@ -164,6 +168,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="SET" suffixOverrides=",">
<if test="ywType != null">yw_type = #{ywType},</if>
<if test="muId != null">mu_id = #{muId},</if>
<if test="muPath != null">mu_path = #{muPath},</if>
<if test="year != null">year = #{year},</if>
<if test="xh != null">xh = #{xh},</if>
<if test="wName != null">w_name = #{wName},</if>

@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="id" column="id" />
<result property="ywType" column="yw_type" />
<result property="muId" column="mu_id" />
<result property="muPath" column="mu_path" />
<result property="num" column="num" />
<result property="name" column="name" />
<result property="address" column="address" />
@ -47,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectDaZfnyhkcgVo">
select id, yw_type, mu_id, 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, 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">
@ -55,6 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<where>
<if test="ywType != null and ywType != ''"> and yw_type = #{ywType}</if>
<if test="muId != null "> and mu_id = #{muId}</if>
<if test="muPath != null and muPath != ''"> and mu_path = #{muPath}</if>
<if test="num != null and num != ''"> and num = #{num}</if>
<if test="name != null and name != ''">
and ( name like concat('%', #{name}, '%')
@ -108,6 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="ywType != null">yw_type,</if>
<if test="muId != null">mu_id,</if>
<if test="muPath != null">mu_path,</if>
<if test="num != null">num,</if>
<if test="name != null">name,</if>
<if test="address != null">address,</if>
@ -148,6 +151,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="ywType != null">#{ywType},</if>
<if test="muId != null">#{muId},</if>
<if test="muPath != null">#{muPath},</if>
<if test="num != null">#{num},</if>
<if test="name != null">#{name},</if>
<if test="address != null">#{address},</if>
@ -192,6 +196,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="SET" suffixOverrides=",">
<if test="ywType != null">yw_type = #{ywType},</if>
<if test="muId != null">mu_id = #{muId},</if>
<if test="muPath != null">mu_path = #{muPath},</if>
<if test="num != null">num = #{num},</if>
<if test="name != null">name = #{name},</if>
<if test="address != null">address = #{address},</if>

@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="id" column="id" />
<result property="ywType" column="yw_type" />
<result property="muId" column="mu_id" />
<result property="muPath" column="mu_path" />
<result property="num" column="num" />
<result property="name" column="name" />
<result property="cardId" column="card_id" />
@ -56,7 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectDaZqzVo">
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
</sql>
<select id="selectDaZqzList" parameterType="DaZqz" resultMap="DaZqzResult">
@ -64,6 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<where>
<if test="ywType != null and ywType != ''"> and yw_type = #{ywType}</if>
<if test="muId != null "> and mu_id = #{muId}</if>
<if test="muPath != null and muPath != ''"> and mu_path = #{muPath}</if>
<if test="num != null and num != ''"> and num = #{num}</if>
<if test="name != null and name != ''">
and ( name like concat('%', #{name}, '%')
@ -125,6 +127,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="ywType != null">yw_type,</if>
<if test="muId != null">mu_id,</if>
<if test="muPath != null">mu_path,</if>
<if test="num != null">num,</if>
<if test="name != null">name,</if>
<if test="cardId != null">card_id,</if>
@ -174,6 +177,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="ywType != null">#{ywType},</if>
<if test="muId != null">#{muId},</if>
<if test="muPath != null">#{muPath},</if>
<if test="num != null">#{num},</if>
<if test="name != null">#{name},</if>
<if test="cardId != null">#{cardId},</if>
@ -227,6 +231,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="SET" suffixOverrides=",">
<if test="ywType != null">yw_type = #{ywType},</if>
<if test="muId != null">mu_id = #{muId},</if>
<if test="muPath != null">mu_path = #{muPath},</if>
<if test="num != null">num = #{num},</if>
<if test="name != null">name = #{name},</if>
<if test="cardId != null">card_id = #{cardId},</if>

Loading…
Cancel
Save