diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ToCityMergeFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ToCityMergeFormDTO.java new file mode 100644 index 000000000..9010c8e10 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ToCityMergeFormDTO.java @@ -0,0 +1,142 @@ +package com.elink.esua.epdc.dto.item.form; + +import java.io.Serializable; +import java.util.List; + +/** + * @ClassName ToCityMergeFormDTO * @Description TODO + * @Author Mia + * @Date 10:21 2024/11/25 + * @Version 1.0 + **/ +public class ToCityMergeFormDTO implements Serializable { + + + /** + * sqsj : 2022-09-01 18:23:00 + * mergelist : ["e2d096bd7e62462ebcaasfb89bdeff737"," e2d096bd7e62462ebcaasfb89bdeff737"] + * sqr : {"xm":"人员","ssbmbm":"所属部门编码","id":"e2d096bd7e62462ebcaasfbdddddd","ssjgbm":"所属机构编码","ssjg":"所属机构","ssbm":"所属部门"} + * sqyy : 申请原因 + * sqid : e2d096bd7e62462ebcaasfb89bdeff737 + * sqbm : 20230516-0001 + */ + private String sqsj; + private List mergelist; + private SqrEntity sqr; + private String sqyy; + private String sqid; + private String sqbm; + + public void setSqsj(String sqsj) { + this.sqsj = sqsj; + } + + public void setMergelist(List mergelist) { + this.mergelist = mergelist; + } + + public void setSqr(SqrEntity sqr) { + this.sqr = sqr; + } + + public void setSqyy(String sqyy) { + this.sqyy = sqyy; + } + + public void setSqid(String sqid) { + this.sqid = sqid; + } + + public void setSqbm(String sqbm) { + this.sqbm = sqbm; + } + + public String getSqsj() { + return sqsj; + } + + public List getMergelist() { + return mergelist; + } + + public SqrEntity getSqr() { + return sqr; + } + + public String getSqyy() { + return sqyy; + } + + public String getSqid() { + return sqid; + } + + public String getSqbm() { + return sqbm; + } + + public class SqrEntity { + /** + * xm : 人员 + * ssbmbm : 所属部门编码 + * id : e2d096bd7e62462ebcaasfbdddddd + * ssjgbm : 所属机构编码 + * ssjg : 所属机构 + * ssbm : 所属部门 + */ + private String xm; + private String ssbmbm; + private String id; + private String ssjgbm; + private String ssjg; + private String ssbm; + + public void setXm(String xm) { + this.xm = xm; + } + + public void setSsbmbm(String ssbmbm) { + this.ssbmbm = ssbmbm; + } + + public void setId(String id) { + this.id = id; + } + + public void setSsjgbm(String ssjgbm) { + this.ssjgbm = ssjgbm; + } + + public void setSsjg(String ssjg) { + this.ssjg = ssjg; + } + + public void setSsbm(String ssbm) { + this.ssbm = ssbm; + } + + public String getXm() { + return xm; + } + + public String getSsbmbm() { + return ssbmbm; + } + + public String getId() { + return id; + } + + public String getSsjgbm() { + return ssjgbm; + } + + public String getSsjg() { + return ssjg; + } + + public String getSsbm() { + return ssbm; + } + } +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index 219b4de14..0d6b8c58b 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -119,6 +119,8 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.joda.time.DateTime; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; @@ -145,7 +147,6 @@ import java.util.stream.Collectors; @Slf4j @Service public class ItemServiceImpl extends BaseServiceImpl implements ItemService { - @Autowired private EpdcEventsService epdcEventsService; @@ -5353,6 +5354,8 @@ public class ItemServiceImpl extends BaseServiceImpl implem }else { throw new RenException("该item不存在" + dto.getItemId()); } + + return new Result(); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml index 264c3be8d..062283346 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml @@ -2605,7 +2605,7 @@