Merge branch 'master' of http://175.27.189.80:3000/souguang/sg_zjjg_sjqy

# Conflicts:
#	target/classes/com/cool/bang/modules/mysql/domain/BuildingAccount.class
#	target/classes/com/cool/bang/modules/mysql/domain/ProjectAccount.class
#	target/classes/com/cool/bang/modules/mysql/service/MySQLService.class
#	target/classes/com/cool/bang/modules/oracle/mapper/OracleMapper.class
#	target/classes/mapper/oracle/AregMapper.xml
#	target/classes/mapper/oracle/OracleMapper.xml

src/main/java/com/cool/bang/api/DataMatch.java

@@ -53,13 +53,21 @@ public class DataMatch {
         mySQLService.superviseBusiness();
     }
 
+    /**
+     * 项目解除业务信息导入
+     */
+    @GetMapping("relieve")
+    public void relieve(){
+        mySQLService.relieve();
+    }
+
     /**
      * 监管开户解除业务表导入
      */
-    @GetMapping("superviseRelieve")
+   /* @GetMapping("superviseRelieve")
     public void superviseRelieve(){
         mySQLService.superviseRelieve();
-    }
+    }*/
 
     /**
      * 监管资金转托管业务表、明细表导入

src/main/java/com/cool/bang/modules/mysql/domain/Relieve.java

@@ -0,0 +1,261 @@
+package com.cool.bang.modules.mysql.domain;
+
+import com.cool.bang.modules.mysql.domain.flowPo.ApprovalRecord;
+import com.cool.bang.modules.oracle.domain.AregItem;
+import com.cool.bang.modules.oracle.domain.po.Jgxmjc;
+import com.sun.istack.internal.NotNull;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 解除申请
+ *
+ * @author PeiZhi Guo
+ * 2022-09-26 09:30
+ */
+public class Relieve {
+
+    private static final long serialVersionUID = 1L;
+
+    private Long id;
+
+    /** 业务编号 */
+    private String businessNumber;
+
+    /** 企业主键 */
+    private Long orgId;
+
+    /** 企业名称 */
+    private String orgName;
+
+    /** 项目主键 */
+    private Long projectId;
+
+    /** 项目编码 */
+    private String projectNumber;
+
+    /** 项目名称 */
+    private String projectName;
+
+    /** 联系人*/
+    private String director;
+
+    /** 联系电话*/
+    private String phone;
+
+    /** 流程号 */
+    private String flowNumber;
+
+    /** 下一个流程节点 */
+    private Long flowNodeId;
+
+    /** 流程节点名称 */
+    private String flowNodeName;
+
+    /** 解除类型 1项目解除 2楼幢解除 */
+    private Integer relieveType;
+
+    /** 解除楼幢 */
+    private String relieveBuilding;
+
+    /** 业务类型 1监管 2托管 */
+    private Integer businessType;
+
+    /** 业务状态 1发起申请 2正在审核 3申请成功 4申请退回 */
+    private Integer businessState;
+
+    /** 删除标识 1正常 0删除 */
+    private Integer delFlag;
+
+    private Date createTime;
+    private Date updateTime;
+    private String remark;
+
+    public Relieve(){}
+
+    public Relieve(Jgxmjc jgxmjc,Org org,Project project){
+        this.businessNumber = jgxmjc.getYwbh();
+        this.orgId = Long.valueOf(org.getId());
+        this.orgName = org.getOrgName();
+        this.projectId = project.getId();
+        this.projectNumber = project.getProjectNumber();
+        this.projectName = project.getProjectName();
+        this.director = jgxmjc.getLxr();
+        this.phone = jgxmjc.getLxdh();
+        this.businessType = jgxmjc.getJglx() == 0 ? 1 : 2;
+        this.businessState = 3;
+        this.delFlag = 1;
+        this.createTime = jgxmjc.getSqrq();
+        this.updateTime = jgxmjc.getShrq();
+        String relieveBuilding = "";
+        if (jgxmjc.getAregItemList() != null && jgxmjc.getAregItemList().size() > 0){
+            for (AregItem aregItem : jgxmjc.getAregItemList()) {
+                relieveBuilding = relieveBuilding + aregItem.getLzmc() + ",";
+            }
+        }
+        this.relieveBuilding = relieveBuilding;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getBusinessNumber() {
+        return businessNumber;
+    }
+
+    public void setBusinessNumber(String businessNumber) {
+        this.businessNumber = businessNumber;
+    }
+
+    public Long getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(Long orgId) {
+        this.orgId = orgId;
+    }
+
+    public String getOrgName() {
+        return orgName;
+    }
+
+    public void setOrgName(String orgName) {
+        this.orgName = orgName;
+    }
+
+    public Long getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(Long projectId) {
+        this.projectId = projectId;
+    }
+
+    public String getProjectNumber() {
+        return projectNumber;
+    }
+
+    public void setProjectNumber(String projectNumber) {
+        this.projectNumber = projectNumber;
+    }
+
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
+    public String getDirector() {
+        return director;
+    }
+
+    public void setDirector(String director) {
+        this.director = director;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public String getFlowNumber() {
+        return flowNumber;
+    }
+
+    public void setFlowNumber(String flowNumber) {
+        this.flowNumber = flowNumber;
+    }
+
+    public Long getFlowNodeId() {
+        return flowNodeId;
+    }
+
+    public void setFlowNodeId(Long flowNodeId) {
+        this.flowNodeId = flowNodeId;
+    }
+
+    public String getFlowNodeName() {
+        return flowNodeName;
+    }
+
+    public void setFlowNodeName(String flowNodeName) {
+        this.flowNodeName = flowNodeName;
+    }
+
+    public Integer getRelieveType() {
+        return relieveType;
+    }
+
+    public void setRelieveType(Integer relieveType) {
+        this.relieveType = relieveType;
+    }
+
+    public String getRelieveBuilding() {
+        return relieveBuilding;
+    }
+
+    public void setRelieveBuilding(String relieveBuilding) {
+        this.relieveBuilding = relieveBuilding;
+    }
+
+    public Integer getBusinessType() {
+        return businessType;
+    }
+
+    public void setBusinessType(Integer businessType) {
+        this.businessType = businessType;
+    }
+
+    public Integer getBusinessState() {
+        return businessState;
+    }
+
+    public void setBusinessState(Integer businessState) {
+        this.businessState = businessState;
+    }
+
+    public Integer getDelFlag() {
+        return delFlag;
+    }
+
+    public void setDelFlag(Integer delFlag) {
+        this.delFlag = delFlag;
+    }
+
+
+}

src/main/java/com/cool/bang/modules/mysql/domain/RelieveDetail.java

@@ -0,0 +1,135 @@
+package com.cool.bang.modules.mysql.domain;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 解除托管详情
+ *
+ * @author PeiZhi Guo
+ * 2023-2-20 15:15
+ */
+public class RelieveDetail implements Serializable {
+
+    private Long id;
+
+    /** 解除托管主键 */
+    private Long relieveId;
+
+    /** 楼幢虚拟户主键 */
+    private Long buildingAccountId;
+
+    /** 楼幢主键 */
+    private Integer buildingId;
+
+    /** 楼幢编号 */
+    private String buildingNumber;
+
+    /** 楼幢名称 */
+    private String buildingName;
+
+    /** 楼幢地址 */
+    private String buildingAddress;
+
+    /** 监管面积 */
+    private BigDecimal buildArea;
+
+    /** 账户余额 */
+    private BigDecimal accountBalance;
+
+    /** 在途资金 */
+    private BigDecimal inTransitFund;
+
+    public RelieveDetail(){}
+
+    public RelieveDetail(BuildingAccount buildingAccount){
+        this.buildingAccountId = buildingAccount.getId();
+        this.buildingId = buildingAccount.getBuildingId();
+        this.buildingNumber = buildingAccount.getBuildingNumber();
+        this.buildingName = buildingAccount.getBuildingName();
+        this.buildingAddress = buildingAccount.getBuildingAddress();
+        this.buildArea = buildingAccount.getBuildArea();
+        this.accountBalance = buildingAccount.getAccountBalance();
+        this.inTransitFund = buildingAccount.getInTransitFund();
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getRelieveId() {
+        return relieveId;
+    }
+
+    public void setRelieveId(Long relieveId) {
+        this.relieveId = relieveId;
+    }
+
+    public Long getBuildingAccountId() {
+        return buildingAccountId;
+    }
+
+    public void setBuildingAccountId(Long buildingAccountId) {
+        this.buildingAccountId = buildingAccountId;
+    }
+
+    public Integer getBuildingId() {
+        return buildingId;
+    }
+
+    public void setBuildingId(Integer buildingId) {
+        this.buildingId = buildingId;
+    }
+
+    public String getBuildingNumber() {
+        return buildingNumber;
+    }
+
+    public void setBuildingNumber(String buildingNumber) {
+        this.buildingNumber = buildingNumber;
+    }
+
+    public String getBuildingName() {
+        return buildingName;
+    }
+
+    public void setBuildingName(String buildingName) {
+        this.buildingName = buildingName;
+    }
+
+    public String getBuildingAddress() {
+        return buildingAddress;
+    }
+
+    public void setBuildingAddress(String buildingAddress) {
+        this.buildingAddress = buildingAddress;
+    }
+
+    public BigDecimal getBuildArea() {
+        return buildArea;
+    }
+
+    public void setBuildArea(BigDecimal buildArea) {
+        this.buildArea = buildArea;
+    }
+
+    public BigDecimal getAccountBalance() {
+        return accountBalance;
+    }
+
+    public void setAccountBalance(BigDecimal accountBalance) {
+        this.accountBalance = accountBalance;
+    }
+
+    public BigDecimal getInTransitFund() {
+        return inTransitFund;
+    }
+
+    public void setInTransitFund(BigDecimal inTransitFund) {
+        this.inTransitFund = inTransitFund;
+    }
+}

src/main/java/com/cool/bang/modules/mysql/domain/SuperviseRelieve.java

@@ -1,6 +1,7 @@
 package com.cool.bang.modules.mysql.domain;
 
 import com.cool.bang.common.util.DateUtil;
+import com.cool.bang.modules.oracle.domain.po.Jgxmjc;
 import com.cool.bang.modules.oracle.domain.po.Jgyw;
 
 import java.util.Date;
@@ -44,8 +45,8 @@ public class SuperviseRelieve {
     /** 开户网点 */
     private String accountOpenAddress;
 
-    /** 项目ID */
-    private Long projectId;
+    /** 项目户ID */
+    private Long projectAccountId;
 
     /** 项目编码 */
     private String projectNumber;
@@ -56,7 +57,7 @@ public class SuperviseRelieve {
     /** 项目地址 */
     private String projectAddress;
 
-    /** pdf路径（资金划转通知书） */
+    /** pdf路径（解除监管通知书） */
     private String pdfUrl;
 
     /** 业务状态 0已撤销 1已申请 2已完成 */
@@ -71,15 +72,35 @@ public class SuperviseRelieve {
 
     public SuperviseRelieve(){}
 
-    public SuperviseRelieve(Account account, Org org, Project project, Jgyw jgyw){
-        this.businessNumber = jgyw.getYwbh();
+//    public SuperviseRelieve(Account account, Org org, Project project, Jgyw jgyw){
+//        this.businessNumber = jgyw.getYwbh();
+//        this.bankCode = account.getBankCode();
+//        this.orgId = org.getId();
+//        this.orgName = org.getOrgName();
+//        this.projectId = project.getId();
+//        this.projectNumber = project.getProjectNumber();
+//        this.projectName = project.getProjectName();
+//        this.projectAddress = project.getProjectAddress();
+//        this.accountId = account.getId();
+//        this.bankName = account.getBankName();
+//        this.name = account.getName();
+//        this.account = account.getAccount();
+//        this.accountOpenAddress = account.getOpenAddress();
+//        this.businessState = 2;
+//        this.delFlag = 1;
+//        this.createTime = DateUtil.strToDate(jgyw.getSqsj(),"yyyy-MM-dd HH:mm:ss");
+//        this.updateTime = DateUtil.strToDate(jgyw.getSpsj(),"yyyy-MM-dd HH:mm:ss");
+//    }
+
+    public SuperviseRelieve(Account account, Org org, ProjectAccount projectAccount, Jgxmjc jgxmjc){
+        this.businessNumber = jgxmjc.getYwbh();
         this.bankCode = account.getBankCode();
         this.orgId = org.getId();
         this.orgName = org.getOrgName();
-        this.projectId = project.getId();
-        this.projectNumber = project.getProjectNumber();
-        this.projectName = project.getProjectName();
-        this.projectAddress = project.getProjectAddress();
+        this.projectAccountId = projectAccount.getId();
+        this.projectNumber = projectAccount.getProjectNumber();
+        this.projectName = projectAccount.getProjectName();
+        this.projectAddress = projectAccount.getProjectAddress();
         this.accountId = account.getId();
         this.bankName = account.getBankName();
         this.name = account.getName();
@@ -87,10 +108,12 @@ public class SuperviseRelieve {
         this.accountOpenAddress = account.getOpenAddress();
         this.businessState = 2;
         this.delFlag = 1;
-        this.createTime = DateUtil.strToDate(jgyw.getSqsj(),"yyyy-MM-dd HH:mm:ss");
-        this.updateTime = DateUtil.strToDate(jgyw.getSpsj(),"yyyy-MM-dd HH:mm:ss");
+        this.createTime = jgxmjc.getSqrq();
+        this.updateTime = jgxmjc.getShrq();
     }
 
+
+
     public Date getCreateTime() {
         return createTime;
     }
@@ -187,12 +210,12 @@ public class SuperviseRelieve {
         this.accountOpenAddress = accountOpenAddress;
     }
 
-    public Long getProjectId() {
-        return projectId;
+    public Long getProjectAccountId() {
+        return projectAccountId;
     }
 
-    public void setProjectId(Long projectId) {
-        this.projectId = projectId;
+    public void setProjectAccountId(Long projectAccountId) {
+        this.projectAccountId = projectAccountId;
     }
 
     public String getProjectNumber() {

src/main/java/com/cool/bang/modules/mysql/mapper/BuildingAccountMapper.java

@@ -2,9 +2,11 @@ package com.cool.bang.modules.mysql.mapper;
 
 import com.cool.bang.modules.mysql.domain.AppropriationDetail;
 import com.cool.bang.modules.mysql.domain.BuildingAccount;
+import com.cool.bang.modules.mysql.domain.RelieveDetail;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.Date;
 import java.util.List;
 
 @Repository
@@ -31,4 +33,11 @@ public interface BuildingAccountMapper {
      * @return
      */
     int updateInLimitFundById(@Param("list") List<AppropriationDetail> details);
+
+    /**
+     * 变更楼幢解除状态
+     * @param relieveDetailList
+     * @return
+     */
+    int updateRelieve(@Param("list") List<RelieveDetail> relieveDetailList, @Param("relieveDate")Date relieveDate);
 }

src/main/java/com/cool/bang/modules/mysql/mapper/MySqlMapper.java

@@ -37,4 +37,8 @@ public interface MySqlMapper {
     int insertAppropriationOutgoing(@Param("list") List<AppropriationOutgoing> outgoingList);
 
     int insertAppropriationPosting(@Param("list") List<AppropriationPosting> postingList);
+
+    int insertRelieve(Relieve relieve);
+
+    int insertRelieveDetail(@Param("list") List<RelieveDetail> relieveDetailList);
 }

src/main/java/com/cool/bang/modules/mysql/mapper/ProjectAccountMapper.java

@@ -1,8 +1,11 @@
 package com.cool.bang.modules.mysql.mapper;
 
 import com.cool.bang.modules.mysql.domain.ProjectAccount;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.Date;
+
 import java.util.List;
 
 @Repository
@@ -22,6 +25,14 @@ public interface ProjectAccountMapper {
      */
     ProjectAccount selectByAregid(Integer aregid);
 
+    /**
+     * 变更项目虚拟户解除信息
+     * @param aregid
+     * @param sqrq
+     * @return
+     */
+    int updateRelieveByAregid(@Param("aregid") Integer aregid, @Param("jcrq") Date jcrq);
+
 
     int updateKeepAmount(Long id);
 

src/main/java/com/cool/bang/modules/mysql/mapper/ProjectMapper.java

@@ -29,4 +29,6 @@ public interface ProjectMapper {
      * @return
      */
     Integer selectProjectHouseTotal(String projectNumber);
+
+    int updateRelieve(Long projectId);
 }

src/main/java/com/cool/bang/modules/mysql/service/MySQLService.java

@@ -16,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.swing.event.ListDataEvent;
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -369,13 +370,96 @@ public class MySQLService {
      */
     @Transactional
     public void relieve(){
-        applyMapper.selectJgxmjc();
+        List<Jgxmjc> jgxmjcList = applyMapper.selectJgxmjc();
+        List<SuperviseRelieve> superviseRelieveList = new ArrayList<>();
+        ApprovalFlow approvalFlow = flowMapper.selectFlowByType(7);//解除申请flowid = 7
+        List<ApprovalNode> nodes = flowMapper.selectNodeByFlowNumber(approvalFlow.getFlowNumber());
+        ApprovalNode endNode = new ApprovalNode();
+        for (ApprovalNode node : nodes) {
+            if (node.getNumber() == 3){
+                endNode = node;
+            }
+        }
+        List<ApprovalRecord> recordList = new ArrayList<>();
+
+        for (Jgxmjc jgxmjc : jgxmjcList) {
+            Org org = qyxxMapper.selectOrgByMisid(jgxmjc.getQybh());
+            Project project = projectMapper.selectByProjectNumber(jgxmjc.getXmbh());
+            ProjectAccount projectAccount = projectAccountMapper.selectByAregid(jgxmjc.getAregid());
+            List<Areg> aregList = applyMapper.selectByXmbhFromAreg(jgxmjc.getXmbh());
+            //项目解除业务信息
+            Relieve relieve = new Relieve(jgxmjc,org,project);
+            relieve.setFlowNumber(approvalFlow.getFlowNumber());
+            relieve.setFlowNodeId(endNode.getId());
+            relieve.setFlowNodeName(endNode.getNodeName());
+            if (aregList.size() == 1){//说明该项目下所有的项目虚拟户都已经解除，可以解除项目、项目虚拟户、账户、楼幢
+                relieve.setRelieveType(1);
+                mySqlMapper.insertRelieve(relieve);
+                projectMapper.updateRelieve(relieve.getProjectId());
+            }else { //说明该项目下存在还没有解除的项目虚拟户，所以只解除该项目虚拟户、以及该项目虚拟户绑定的账户、楼幢
+                relieve.setRelieveType(2);
+                mySqlMapper.insertRelieve(relieve);
+            }
+            //项目虚拟户变更解除状态
+            projectAccountMapper.updateRelieveByAregid(jgxmjc.getAregid(),jgxmjc.getSqrq());
+            //监管账户解除业务信息
+            if (jgxmjc.getAccountList() != null && jgxmjc.getAccountList().size() > 0){
+                for (Account account : jgxmjc.getAccountList()) {
+                    account = accountMapper.selectByAccountNO(account.getAccount());
+                    SuperviseRelieve superviseRelieve = new SuperviseRelieve(account,org,projectAccount,jgxmjc);
+                    superviseRelieveList.add(superviseRelieve);
+                    //更新账户解除日期
+                    accountMapper.updateCancelDate(account.getId(),superviseRelieve.getUpdateTime());
+                }
+            }
+            //解除明细
+            List<RelieveDetail> relieveDetailList = new ArrayList<>();
+            if (jgxmjc.getAregItemList() != null && jgxmjc.getAregItemList().size() > 0){
+                for (AregItem aregItem : jgxmjc.getAregItemList()) {
+                    BuildingAccount buildingAccount = buildingAccountMapper.selectByBuildingNumber(aregItem.getLzbh());
+                    RelieveDetail relieveDetail = new RelieveDetail(buildingAccount);
+                    relieveDetail.setRelieveId(relieve.getId());
+                    relieveDetailList.add(relieveDetail);
+                }
+                mySqlMapper.insertRelieveDetail(relieveDetailList);
+                buildingAccountMapper.updateRelieve(relieveDetailList,jgxmjc.getShrq());
+            }
+            //审批流程
+            if (jgxmjc.getsFlowList() != null && jgxmjc.getsFlowList().size() > 0){
+                for (SFlow sFlow : jgxmjc.getsFlowList()) {
+                    ApprovalRecord record = new ApprovalRecord();
+                    record.setBusinessNumber(relieve.getBusinessNumber());
+                    record.setFlowNumber(relieve.getFlowNumber());
+                    record.setTableId(relieve.getId());
+                    record.setApprovalTime(sFlow.getShsj());
+                    record.setApprovalRemark(sFlow.getBz());
+                    record.setCreateTime(record.getApprovalTime());
+                    record.setUpdateTime(record.getApprovalTime());
+                    record.setDelFlag(1);
+                    if (sFlow.getShzt() == null){
+                        record.setNodeName("申请节点");
+                        record.setApprover(relieve.getOrgName()+"("+sFlow.getShr()+")");
+                    }else {
+                        record.setNodeName(sFlow.getLcmc());
+                        record.setApprover("监管部门("+sFlow.getShr()+")");
+                        if (sFlow.getShzt() == 1){
+                            record.setApprovalStatus(1);
+                        }else {
+                            record.setApprovalStatus(2);
+                        }
+                    }
+                    recordList.add(record);
+                }
+            }
+        }
+        mySqlMapper.insertSuperviseRelieve(superviseRelieveList);
+        flowMapper.insertRecordBatch(recordList);
     }
 
     /**
      * 监管账户解除业务表导入
      */
-    @Transactional
+    /*@Transactional
     public void superviseRelieve(){
         System.out.println("===============fc_supervise_relieve数据匹配开始=================");
 
@@ -402,7 +486,7 @@ public class MySQLService {
         int i = mySqlMapper.insertSuperviseRelieve(superviseRelieveList);
 
         System.out.println("===============fc_supervise_relieve数据匹配结束 插入数据"+i+"条==============");
-    }
+    }*/
 
     /**
      * 监管资金转托管业务表、明细表导入

src/main/java/com/cool/bang/modules/oracle/domain/po/Jgxmjc.java

@@ -1,5 +1,9 @@
 package com.cool.bang.modules.oracle.domain.po;
 
+import com.cool.bang.modules.mysql.domain.Account;
+import com.cool.bang.modules.oracle.domain.AregItem;
+
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -15,7 +19,7 @@ public class Jgxmjc {
     /**
      * 企业编号
      */
-    private String qybh;
+    private Integer qybh;
 
     /**
      * 项目编号
@@ -39,8 +43,54 @@ public class Jgxmjc {
 
     private Integer aregid;
 
+    /**
+     * 申请日期
+     */
+    private Date sqrq;
+
+    /**
+     * 审核日期
+     */
+    private Date shrq;
+
     private List<SFlow> sFlowList;
 
+    private List<AregItem> aregItemList;
+
+    private List<Account> accountList;
+
+    public List<AregItem> getAregItemList() {
+        return aregItemList;
+    }
+
+    public void setAregItemList(List<AregItem> aregItemList) {
+        this.aregItemList = aregItemList;
+    }
+
+    public List<Account> getAccountList() {
+        return accountList;
+    }
+
+    public void setAccountList(List<Account> accountList) {
+        this.accountList = accountList;
+    }
+
+    public Date getSqrq() {
+        return sqrq;
+    }
+
+    public void setSqrq(Date sqrq) {
+        this.sqrq = sqrq;
+    }
+
+    public Date getShrq() {
+        return shrq;
+    }
+
+    public void setShrq(Date shrq) {
+        this.shrq = shrq;
+    }
+
     public List<SFlow> getsFlowList() {
         return sFlowList;
     }
@@ -57,11 +107,11 @@ public class Jgxmjc {
         this.ywbh = ywbh;
     }
 
-    public String getQybh() {
+    public Integer getQybh() {
         return qybh;
     }
 
-    public void setQybh(String qybh) {
+    public void setQybh(Integer qybh) {
         this.qybh = qybh;
     }
 

src/main/java/com/cool/bang/modules/oracle/mapper/ApplyMapper.java

@@ -1,5 +1,6 @@
 package com.cool.bang.modules.oracle.mapper;
 
+import com.cool.bang.modules.oracle.domain.Areg;
 import com.cool.bang.modules.oracle.domain.po.Bfxx;
 import com.cool.bang.modules.oracle.domain.po.Jgxmjc;
 import com.cool.bang.modules.oracle.domain.po.Jgyw;
@@ -41,4 +42,6 @@ public interface ApplyMapper {
      * @return
      */
     List<Jgxmjc> selectJgxmjc();
+
+    List<Areg> selectByXmbhFromAreg(String xmbh);
 }

src/main/resources/mapper/mysql/BuildingAccountMapper.xml

@@ -19,6 +19,13 @@
         </foreach>
     </update>
 
+    <!--  变更楼幢解除状态  -->
+    <update id="updateRelieve">
+        <foreach collection="list" item="item" separator=";">
+            update fc_building_account set relieve_date = #{relieveDate},state = 0 where building_number = #{item.buildingNumber}
+        </foreach>
+    </update>
+
     <select id="selectByBuildingNumber" resultType="com.cool.bang.modules.mysql.domain.BuildingAccount">
         select
             id, building_number as buildingNumber, building_name as buildingName

src/main/resources/mapper/mysql/MySQLMapper.xml

@@ -15,10 +15,10 @@
     <!--  插入监管解除申请业务表数据  -->
     <insert id="insertSuperviseRelieve">
         insert into
-            fc_supervise_relieve (id, business_number, account_id, name, account, org_id, org_name, bank_code, bank_name, account_open_address, project_id, project_number, project_name, project_address, pdf_url, business_state, create_time, update_time, del_flag)
+            fc_supervise_relieve (id, business_number, account_id, name, account, org_id, org_name, bank_code, bank_name, account_open_address, project_account_id, project_number, project_name, project_address, pdf_url, business_state, create_time, update_time, del_flag)
         values
         <foreach collection="list" item="item" separator=",">
-            (#{item.id}, #{item.businessNumber}, #{item.accountId}, #{item.name}, #{item.account}, #{item.orgId}, #{item.orgName}, #{item.bankCode}, #{item.bankName}, #{item.accountOpenAddress}, #{item.projectId}, #{item.projectNumber}, #{item.projectName}, #{item.projectAddress}, #{item.pdfUrl}, #{item.businessState}, #{item.createTime}, #{item.updateTime}, #{item.delFlag})
+            (#{item.id}, #{item.businessNumber}, #{item.accountId}, #{item.name}, #{item.account}, #{item.orgId}, #{item.orgName}, #{item.bankCode}, #{item.bankName}, #{item.accountOpenAddress}, #{item.projectAccountId}, #{item.projectNumber}, #{item.projectName}, #{item.projectAddress}, #{item.pdfUrl}, #{item.businessState}, #{item.createTime}, #{item.updateTime}, #{item.delFlag})
         </foreach>
     </insert>
 
@@ -115,4 +115,22 @@
             (#{item.id}, #{item.businessNumber}, #{item.bankCode}, #{item.orgId}, #{item.orgName}, #{item.appropriationId}, #{item.projectAccountId}, #{item.projectName}, #{item.appropriationAccountId}, #{item.appropriationBank}, #{item.appropriationName}, #{item.appropriationAccount}, #{item.appropriationOpenAddress}, #{item.collectionAccountId}, #{item.collectionBank}, #{item.collectionName}, #{item.collectionAccount}, #{item.collectionOpenAddress}, #{item.postingAmount}, #{item.postingStatus}, #{item.purpose}, #{item.isRescind}, #{item.createTime}, #{item.updateTime}, #{item.delFlag}, #{item.remark})
         </foreach>
     </insert>
+
+    <!--  插入项目解除监管业务数据  -->
+    <insert id="insertRelieve" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+        insert into
+            fc_relieve (id, business_number, org_id, org_name, project_id, project_number, project_name, director, phone, flow_number, flow_node_id, flow_node_name, relieve_type, business_type, business_state, remark, create_time, update_time, del_flag)
+        values
+            (#{id}, #{businessNumber},#{orgId}, #{orgName}, #{projectId}, #{projectNumber}, #{projectName}, #{director}, #{phone}, #{flowNumber}, #{flowNodeId}, #{flowNodeName}, #{relieveType}, #{businessType}, #{businessState}, #{remark}, #{createTime}, #{updateTime}, #{delFlag})
+    </insert>
+
+    <!--  插入项目解除监管业务详情数据  -->
+    <insert id="insertRelieveDetail">
+        insert into
+            fc_relieve_detail (id, relieve_id, building_account_id, building_id, building_number, building_name, building_address, build_area, account_balance, in_transit_fund)
+        values
+        <foreach collection="list" item="item" separator=",">
+            (#{item.id}, #{item.relieveId}, #{item.buildingAccountId}, #{item.buildingId}, #{item.buildingNumber}, #{item.buildingName}, #{item.buildingAddress}, #{item.buildArea}, #{item.accountBalance}, #{item.inTransitFund})
+        </foreach>
+    </insert>
 </mapper>

src/main/resources/mapper/mysql/ProjectAccountMapper.xml

@@ -40,6 +40,10 @@
             (#{id}, #{aregid}, #{bankCode}, #{bankName}, #{orgId}, #{orgName}, #{projectId}, #{projectNumber}, #{projectName}, #{projectAddress}, #{buildingTotal}, #{buildArea}, #{superviseAmount}, #{keepAmount}, #{accountId}, #{trusteeshipBalance}, #{superviseBalance}, #{trusteeshipInTransitFund}, #{superviseInTransitFund}, #{buildCostId}, #{buildCostName}, #{relieveDate},  #{isFrozen}, #{accountType}, #{state}, #{createTime}, #{delFlag})
     </insert>
 
+    <update id="updateRelieveByAregid">
+        update fc_project_account set relieve_date = #{jcrq}, state = 0 where aregid = #{aregid}
+    </update>
+
     <!--  通过yszjjg-aregid查询  -->
     <select id="selectByAregid" resultMap="projectAccountMap">
         select

src/main/resources/mapper/mysql/ProjectMapper.xml

@@ -33,6 +33,11 @@
         </foreach>
     </insert>
 
+    <!--  变更项目状态为已解除  -->
+    <update id="updateRelieve">
+        update fc_project set state = 0 where id = #{id}
+    </update>
+
     <select id="selectByProjectNumber" resultMap="resultMap">
         select * from fc_project where project_number = #{projectNumber}
     </select>

src/main/resources/mapper/oracle/ApplyMapper.xml

@@ -37,8 +37,10 @@
         <result property="xmbh"      column="xmbh"     jdbcType="VARCHAR"/>
         <result property="lxr"       column="lxr"      jdbcType="VARCHAR"/>
         <result property="lxdh"      column="lxdh"     jdbcType="VARCHAR"/>
-        <result property="jglx"      column="lxdh"     jdbcType="INTEGER"/>
+        <result property="jglx"      column="jglx"     jdbcType="INTEGER"/>
         <result property="aregid"    column="aregid"   jdbcType="INTEGER"/>
+        <result property="sqrq"      column="sqrq"     jdbcType="TIMESTAMP"/>
+        <result property="shrq"      column="shrq"     jdbcType="TIMESTAMP"/>
         <collection property="sFlowList"  ofType="com.cool.bang.modules.oracle.domain.po.SFlow" >
             <result property="lcmc"        column="lcmc"      jdbcType="VARCHAR"/>
             <result property="shsj"        column="shsj"      jdbcType="TIMESTAMP"/>
@@ -46,19 +48,35 @@
             <result property="bz"          column="bz"        jdbcType="VARCHAR"/>
             <result property="shzt"        column="shzt"      jdbcType="INTEGER"/>
         </collection>
+        <collection property="aregItemList"  ofType="com.cool.bang.modules.oracle.domain.AregItem" >
+            <result property="lzbh"           column="lzbh"         jdbcType="VARCHAR"/>
+            <result property="lzmc"           column="lzmc"         jdbcType="VARCHAR"/>
+        </collection>
+        <collection property="accountList"  ofType="com.cool.bang.modules.mysql.domain.Account" >
+            <result property="account"           column="accountno"         jdbcType="VARCHAR"/>
+        </collection>
     </resultMap>
     <select id="selectJgxmjc" resultMap="JgxmjcMap">
         select
-            t1.appbh as ywbh,t2.qybh,t2.xmbh,t1.jbr as lxr,t1.lxdh,t2.jglx,t2.aregid,
-            t3.flownodename as lcmc,t3.operatedate as lcshsj,t3.operator as shr,t3.remark as bz,t3.state as shzt
+            t1.appbh as ywbh,t2.qybh,t2.xmbh,t1.jbr as lxr,t1.lxdh,t2.jglx,t2.aregid,t1.sqsj as sqrq,t1.spjssj as shrq,
+            t3.flownodename as lcmc,t3.operatedate as lcshsj,t3.operator as shr,t3.remark as bz,t3.state as shzt,
+            t4.accountno,t5.lzbh,t5.lzmc
         from
             apply t1
         left join
             areg t2 on t1.aregid = t2.aregid
         left join
-            sflowlog t3 on t3.infoid = t1.appid and t3.flowid = 16
+            sflowlog t3 on t3.infoid = t1.appid and t3.flowid = 3
+        left join
+            account t4 on t1.aregid = t4.aregid and t4.accountno is not null
+        left join
+            aregitem t5 on t1.aregid = t5.aregid and t5.jiechuappid is null
         where t1.apptype = 4 and t1.state = 1 and t1.flowstate = 0
     </select>
+    
+    <select id="selectByXmbhFromAreg" resultType="com.cool.bang.modules.oracle.domain.Areg">
+        select jgstate from areg where xmbh = #{xmbh} group by jgstate
+    </select>
 
     <!--  监管转托管业务数据  -->
     <resultMap id="JgztgMap" type="com.cool.bang.modules.oracle.domain.po.Jgztg">

target/classes/application.yml

@@ -1,67 +0,0 @@
-server:
-  port: 8089
-  tomcat:
-    uri-encoding: UTF-8
-  servlet:
-    context-path: /
-spring:
-  servlet:
-    multipart:
-      max-file-size: 100MB
-      max-request-size: 100MB
-  datasource:
-    druid:
-      zjjg-mysql:
-        driver-class-name: com.mysql.cj.jdbc.Driver
-        url: jdbc:mysql://192.168.0.199:3306/sg_zjjg?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
-#        url: jdbc:mysql://localhost:3306/sg_zjjg_sjdr?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
-        username: root
-        password: 123456
-        initial-size: 10
-        max-active: 20
-        min-idle: 1
-        max-wait: 60000
-        time-between-eviction-runs-millis: 60000
-        min-evictable-idle-time-millis: 30000
-        validation-query: select 1
-        validation-query-timeout: 500
-        test-while-idle: true
-        test-on-borrow: false
-        test-on-return: false
-        pool-prepared-statements: false
-        filters: stat
-        connection-properties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=500
-        stat-view-servlet.enabled: true
-      yszj-oracle:
-        driver-class-name: oracle.jdbc.driver.OracleDriver
-        url: jdbc:oracle:thin:@192.168.0.199:1521:orcl
-        username: yszjjg
-        password: yszjjg
-        initial-size: 1
-        min-idle: 5
-        max-active: 20
-        max-wait: 30000
-        time-between-eviction-runs-millis: 60000
-        min-evictable-idle-time-millis: 30000
-        validation-query: select 1 from dual
-        test-while-idle: true
-        test-on-borrow: false
-        test-on-return: false
-        pool-prepared-statements: true
-        filters: stat,wall
-        connection-properties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=500
-        stat-view-servlet.enabled: true
-pagehelper:
-  helper-dialect: oracle
-  reasonable: true
-  support-methods-arguments: true
-  params: count=countSql
-logging:
-  level:
-    com.cool.bang: debug
-  file:
-    path: d:\log\coob
-cool:
-  static-path: classpath:/static/
-  file-path: D:/cool/
-  expire-date: 2099-01-01

target/classes/mapper/mysql/AccountMapper.xml

@@ -1,61 +0,0 @@
-<?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" >
-<mapper namespace="com.cool.bang.modules.mysql.mapper.AccountMapper">
-
-    <resultMap id="resultMap" type="com.cool.bang.modules.mysql.domain.Account">
-        <id property="id" column="id" jdbcType="BIGINT"/>
-        <result property="bankCode"         column="bank_code"          jdbcType="VARCHAR"/>
-        <result property="bankName"         column="bank_name"          jdbcType="VARCHAR"/>
-        <result property="orgId"            column="org_id"             jdbcType="BIGINT"/>
-        <result property="orgName"          column="org_name"           jdbcType="VARCHAR"/>
-        <result property="projectId"        column="project_id"         jdbcType="BIGINT"/>
-        <result property="projectNumber"    column="project_number"     jdbcType="VARCHAR"/>
-        <result property="projectName"      column="project_name"       jdbcType="VARCHAR"/>
-        <result property="name"             column="name"               jdbcType="VARCHAR"/>
-        <result property="account"          column="account"            jdbcType="VARCHAR"/>
-        <result property="bookBalance"      column="book_balance"       jdbcType="DECIMAL"/>
-        <result property="accountBalance"   column="account_balance"    jdbcType="DECIMAL"/>
-        <result property="incomeBalance"    column="income_balance"     jdbcType="DECIMAL"/>
-        <result property="inTransitFund"    column="in_transit_fund"    jdbcType="DECIMAL"/>
-        <result property="openAddress"      column="open_address"       jdbcType="VARCHAR"/>
-        <result property="openDate"         column="open_date"          jdbcType="VARCHAR"/>
-        <result property="cancelDate"       column="cancel_date"        jdbcType="VARCHAR"/>
-        <result property="type"             column="type"               jdbcType="INTEGER"/>
-        <result property="state"            column="state"              jdbcType="INTEGER"/>
-        <result property="isFrozen"         column="is_frozen"          jdbcType="INTEGER"/>
-        <result property="delFlag"          column="del_flag"           jdbcType="TINYINT"/>
-    </resultMap>
-
-    <!-- 插入一条记录 -->
-    <insert id="insertAccount" useGeneratedKeys="true" keyColumn="id" keyProperty="id"
-            parameterType="com.cool.bang.modules.mysql.domain.Account">
-        insert into fc_account 
-            (id, bank_code, bank_name, org_id, org_name, project_id, project_number, project_name, book_balance, account_balance, income_balance, in_transit_fund, open_date, cancel_date, type,state, is_frozen,name, account, open_address, create_time, del_flag)
-        values
-        <foreach collection="list" item="item" separator=",">
-            (#{item.id}, #{item.bankCode} ,#{item.bankName}, #{item.orgId}, #{item.orgName}, #{item.projectId}, #{item.projectNumber}, #{item.projectName}, #{item.bookBalance}, #{item.accountBalance}, #{item.incomeBalance}, #{item.inTransitFund}, #{item.openDate}, #{item.cancelDate}, #{item.type}, #{item.state}, #{item.isFrozen}, #{item.name}, #{item.account}, #{item.openAddress}, now(), #{item.delFlag})
-        </foreach>
-    </insert>
-
-    <!--  更新账户解除日期  -->
-    <update id="updateCancelDate">
-        update fc_account set cancel_date = #{cancelDate} where id = #{accountId}
-    </update>
-
-    <select id="selectByAccountNO" resultMap="resultMap">
-        select
-            id, bank_code, bank_name, org_id, org_name, project_id, project_number, project_name, name, account, book_balance, account_balance, income_balance, in_transit_fund, open_address, open_date, cancel_date, type, state, is_frozen
-        from
-            fc_account
-        where
-            account = #{accountNO}
-    </select>
-
-    <select id="selectReuseAcoount" resultType="java.lang.Long">
-        select id from fc_account t2 where account in (select t1.account from (select account,count(*) as count from fc_account group by account) t1 where t1.count > 1) and state = 3
-    </select>
-
-    <delete id="deleteById">
-        delete from fc_account where id = #{id}
-    </delete>
-</mapper>

target/classes/mapper/mysql/BankMapper.xml

@@ -1,23 +0,0 @@
-<?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" >
-<mapper namespace="com.cool.bang.modules.mysql.mapper.BankMapper">
-
-    <resultMap id="bankMap" type="com.cool.bang.modules.mysql.domain.Bank">
-        <id property="id" column="id"/>
-        <result property="code"        column="code"        jdbcType="VARCHAR"/>
-        <result property="bankName"    column="bank_name"   jdbcType="VARCHAR"/>
-        <result property="director"    column="director"    jdbcType="VARCHAR"/>
-        <result property="phone"       column="phone"       jdbcType="VARCHAR"/>
-        <result property="address"     column="address"     jdbcType="VARCHAR"/>
-        <result property="trusteeship" column="trusteeship" jdbcType="TINYINT"/>
-        <result property="supervise"   column="supervise"   jdbcType="TINYINT"/>
-        <result property="authState"   column="auth_state"  jdbcType="INTEGER"/>
-        <result property="token"       column="token"       jdbcType="VARCHAR"/>
-        <result property="secret"      column="secret"      jdbcType="VARCHAR"/>
-        <result property="delFlag"     column="del_flag"    jdbcType="TINYINT"/>
-    </resultMap>
-
-    <select id="selectByName" resultMap="bankMap">
-        select * from fc_bank where bank_name = #{bankName}
-    </select>
-</mapper>

target/classes/mapper/mysql/BuildingAccountMapper.xml

@@ -1,31 +0,0 @@
-<?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" >
-<mapper namespace="com.cool.bang.modules.mysql.mapper.BuildingAccountMapper">
-
-    <!--  插入楼幢虚拟户表数据  -->
-    <insert id="insertBuildingAccount">
-        insert into
-            fc_building_account (id, org_id, org_name, project_id, project_account_id, project_number, project_name, building_id, building_number, building_name, building_address, build_area, house_number, build_cost_id, build_cost_name, build_cost_price, progress_id, progress_name, limit_percentage, adjustment_percentage, bank_percentage, keep_percentage, keep_amount, supervise_amount, account_balance, in_transit_fund, in_limit_fund, relieve_id, relieve_date, is_frozen, account_type, state, create_time, del_flag)
-        values
-        <foreach collection="list" item="item" separator=",">
-            (#{item.id}, #{item.orgId}, #{item.orgName}, #{item.projectId}, #{projectAccountId}, #{item.projectNumber}, #{item.projectName}, #{item.buildingId}, #{item.buildingNumber}, #{item.buildingName}, #{item.buildingAddress}, #{item.buildArea}, #{item.houseNumber}, #{item.buildCostId}, #{item.buildCostName}, #{item.buildCostPrice}, #{item.progressId}, #{item.progressName}, #{item.limitPercentage}, #{item.adjustmentPercentage}, #{item.bankPercentage}, #{item.keepPercentage}, #{item.keepAmount}, #{item.superviseAmount}, #{item.accountBalance}, #{item.inTransitFund}, #{item.inLimitFund}, #{item.relieveId}, #{item.relieveDate}, #{item.isFrozen}, #{item.accountType}, #{item.state}, #{item.createTime}, #{item.delFlag})
-        </foreach>
-    </insert>
-
-    <!--  变更楼幢虚拟户额度内拨付金额  -->
-    <update id="updateInLimitFundById">
-        <foreach collection="list" item="item" separator=";">
-            update fc_building_account set in_limit_fund = in_limit_fund + #{item.applyAmount} where id = #{item.buildingAccountId}
-        </foreach>
-    </update>
-
-    <select id="selectByBuildingNumber" resultType="com.cool.bang.modules.mysql.domain.BuildingAccount">
-        select
-            id, building_number as buildingNumber, building_name as buildingName
-        from
-            fc_building_account
-        where
-            building_number = #{buildingNumber}
-    </select>
-
-</mapper>

target/classes/mapper/mysql/BuildingMapper.xml

@@ -1,16 +0,0 @@
-<?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" >
-<mapper namespace="com.cool.bang.modules.mysql.mapper.BuildingMapper">
-
-    <!--  通过楼幢编码查询楼幢信息  -->
-    <select id="selectByBuildingNumber" resultType="com.cool.bang.modules.mysql.domain.Building">
-        select
-            id, lzmc as buildingName, lzzl as buildingAddress,zts as houseNumber
-        from
-            p_lpb_lz
-        where
-            state = 1 and lzbm = #{buildingNumber}
-    </select>
-
-
-</mapper>

target/classes/mapper/mysql/MySQLMapper.xml

@@ -1,118 +0,0 @@
-<?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" >
-<mapper namespace="com.cool.bang.modules.mysql.mapper.MySqlMapper">
-
-    <!-- 插入监管开户申请业务表数据 -->
-    <insert id="insertSuperviseBusiness">
-        insert into
-            fc_supervise_business (id, business_number, bank_code, org_id, org_name, project_id, project_number, project_name, project_address, account_id, bank_name, name, account, account_open_address, operator, operator_phone, notice_pdf_url, agreement_pdf_url, business_state, open_date, create_time, update_time, del_flag)
-        values
-        <foreach collection="list" item="item" separator=",">
-            (#{item.id}, #{item.businessNumber}, #{item.bankCode}, #{item.orgId}, #{item.orgName}, #{item.projectId}, #{item.projectNumber}, #{item.projectName}, #{item.projectAddress}, #{item.accountId}, #{item.bankName}, #{item.name}, #{item.account}, #{item.accountOpenAddress}, #{item.operator}, #{item.operatorPhone}, #{item.noticePdfUrl}, #{item.agreementPdfUrl}, #{item.businessState}, #{item.openDate}, #{item.createTime}, #{item.updateTime}, #{item.delFlag})
-        </foreach>
-    </insert>
-
-    <!--  插入监管解除申请业务表数据  -->
-    <insert id="insertSuperviseRelieve">
-        insert into
-            fc_supervise_relieve (id, business_number, account_id, name, account, org_id, org_name, bank_code, bank_name, account_open_address, project_id, project_number, project_name, project_address, pdf_url, business_state, create_time, update_time, del_flag)
-        values
-        <foreach collection="list" item="item" separator=",">
-            (#{item.id}, #{item.businessNumber}, #{item.accountId}, #{item.name}, #{item.account}, #{item.orgId}, #{item.orgName}, #{item.bankCode}, #{item.bankName}, #{item.accountOpenAddress}, #{item.projectId}, #{item.projectNumber}, #{item.projectName}, #{item.projectAddress}, #{item.pdfUrl}, #{item.businessState}, #{item.createTime}, #{item.updateTime}, #{item.delFlag})
-        </foreach>
-    </insert>
-
-    <!--  插入监管资金转托管业务数据  -->
-    <insert id="insertSuperviseTo" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-        insert into
-            fc_supervise_to (id, business_number, bank_code, org_id, org_name, project_id, project_number, project_name, project_account_id, director, phone, appropriation_account_id, appropriation_bank, appropriation_name, appropriation_account, appropriation_open_address, collection_account_id, collection_bank, collection_name, collection_account, collection_open_address,transfer_amount,  flow_number, flow_node_id, flow_node_name, business_state, application_state, create_time, update_time, remark, del_flag)
-        values
-            (#{id}, #{businessNumber}, #{bankCode}, #{orgId}, #{orgName}, #{projectId}, #{projectNumber}, #{projectName}, #{projectAccountId}, #{director}, #{phone}, #{appropriationAccountId}, #{appropriationBank}, #{appropriationName}, #{appropriationAccount}, #{appropriationOpenAddress}, #{collectionAccountId}, #{collectionBank}, #{collectionName}, #{collectionAccount},#{collectionOpenAddress}, #{transferAmount}, #{flowNumber}, #{flowNodeId}, #{flowNodeName}, #{businessState}, #{applicationState}, #{createTime}, #{updateTime}, #{remark}, #{delFlag})
-    </insert>
-
-    <!--  插入监管资金转托管详情数据  -->
-    <insert id="insertSuperviseToDetail">
-        insert into
-            fc_supervise_to_detail (id, supervise_to_id, building_account_id, building_number, building_name, account_balance, keep_percentage, keep_amount, transfer_amount, create_time, update_time, del_flag)
-        values
-        <foreach collection="list" item="item" separator=",">
-            (#{item.id}, #{item.superviseToId}, #{item.buildingAccountId}, #{item.buildingNumber}, #{item.buildingName}, #{item.accountBalance}, #{item.keepPercentage}, #{item.keepAmount}, #{item.transferAmount}, #{item.createTime}, #{item.updateTime}, #{item.delFlag})
-        </foreach>
-    </insert>
-
-    <!--  插入监管资金转托管 转入通知书数据  -->
-    <insert id="insertSuperviseToPosting">
-        insert into
-            fc_supervise_to_posting (id, business_number, bank_code, org_id, org_name, supervise_to_id, project_id, project_number, project_name, project_account_id, appropriation_account_id, appropriation_bank, appropriation_name, appropriation_account, appropriation_open_address, collection_account_id, collection_bank, collection_name, collection_account, posting_amount, posting_status, is_rescind, remark, create_time, update_time)
-        values
-        <foreach collection="list" item="item" separator=",">
-            (#{item.id}, #{item.businessNumber}, #{item.bankCode}, #{item.orgId}, #{item.orgName}, #{item.superviseToId}, #{item.projectId}, #{item.projectNumber}, #{item.projectName}, #{item.projectAccountId}, #{item.appropriationAccountId}, #{item.appropriationBank}, #{item.appropriationName}, #{item.appropriationAccount}, #{item.appropriationOpenAddress}, #{item.collectionAccountId}, #{item.collectionBank}, #{item.collectionName}, #{item.collectionAccount}, #{item.postingAmount}, #{item.postingStatus}, #{item.isRescind}, #{item.remark}, #{item.createTime}, #{item.updateTime})
-        </foreach>
-    </insert>
-
-    <!--  插入监管资金转托管 转出通知书数据  -->
-    <insert id="insertSuperviseToOutgoing">
-        insert into
-            fc_supervise_to_outgoing (id, business_number, bank_code, org_id, org_name, supervise_to_id, project_id, project_number, project_name, project_account_id, appropriation_account_id, appropriation_bank, appropriation_name, appropriation_account, appropriation_open_address, collection_account_id,collection_open_address, collection_bank, collection_name, collection_account, apply_amount, appropriation_status, is_rescind, remark, create_time, update_time)
-        values
-        <foreach collection="list" item="item" separator=",">
-            (#{item.id}, #{item.businessNumber}, #{item.bankCode}, #{item.orgId}, #{item.orgName}, #{item.superviseToId}, #{item.projectId}, #{item.projectNumber}, #{item.projectName}, #{item.projectAccountId}, #{item.appropriationAccountId}, #{item.appropriationBank}, #{item.appropriationName}, #{item.appropriationAccount}, #{item.appropriationOpenAddress}, #{item.collectionAccountId},#{item.collectionOpenAddress}, #{item.collectionBank}, #{item.collectionName}, #{item.collectionAccount}, #{item.applyAmount}, #{item.appropriationStatus}, #{item.isRescind}, #{item.remark}, #{item.createTime}, #{item.updateTime})
-        </foreach>
-    </insert>
-
-    <!--  插入施工进度申请业务信息  -->
-    <insert id="insertProgress" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-        insert into
-            fc_progress_business (id, business_number, org_id, org_name, project_account_id, project_name, flow_number, flow_node_id, flow_node_name, business_state, create_time, update_time, del_flag)
-        values
-            (#{id,jdbcType=BIGINT}, #{businessNumber,jdbcType=VARCHAR}, #{orgId,jdbcType=BIGINT}, #{orgName,jdbcType=VARCHAR}, #{projectAccountId,jdbcType=BIGINT}, #{projectName,jdbcType=VARCHAR}, #{flowNumber,jdbcType=VARCHAR}, #{flowNodeId,jdbcType=BIGINT}, #{flowNodeName,jdbcType=VARCHAR}, #{businessState,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{delFlag,jdbcType=TINYINT})
-   </insert>
-
-    <!--  插入施工进度申请明细表信息  -->
-    <insert id="insertProgressDetail">
-        insert into
-            fc_progress_detail (id, progress_business_id, building_number, building_name, now_progress_name, progress_id, progress_name, limit_percentage, building_account_id, building_account_name, url, create_time, update_time)
-        values
-        <foreach collection="list" item="item" separator=",">
-            (#{item.id}, #{item.progressBusinessId}, #{item.buildingNumber}, #{item.buildingName},#{item.nowProgressName}, #{item.progressId}, #{item.progressName}, #{item.limitPercentage}, #{item.buildingAccountId}, #{item.buildingAccountName}, #{item.url}, #{item.createTime}, #{item.updateTime})
-        </foreach>
-    </insert>
-
-    <!--  插入拨付申请业务数据  -->
-    <insert id="insertAppropriation" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-        insert into
-            fc_appropriation (id, business_number, bank_code, org_id, org_name, project_id, project_account_id, project_number, project_name, director, phone, application_type, appropriation_account_id, appropriation_bank, appropriation_name, appropriation_account, appropriation_open_address, collection_account_id, collection_bank, collection_name, collection_account, collection_open_address, collection_type, appropriation_type, apply_amount, purpose, flow_number, flow_node_id, flow_node_name, pdf_url, pdf_url_notice, business_state, application_state, create_time, update_time, remark, del_flag)
-        values
-            (#{id}, #{businessNumber}, #{bankCode}, #{orgId}, #{orgName}, #{projectId}, #{projectAccountId}, #{projectNumber}, #{projectName}, #{director}, #{phone}, #{applicationType}, #{appropriationAccountId}, #{appropriationBank}, #{appropriationName}, #{appropriationAccount}, #{appropriationOpenAddress}, #{collectionAccountId}, #{collectionBank}, #{collectionName}, #{collectionAccount}, #{collectionOpenAddress}, #{collectionType}, #{appropriationType}, #{applyAmount}, #{purpose}, #{flowNumber}, #{flowNodeId}, #{flowNodeName}, #{pdfUrl}, #{pdfUrlNotice}, #{businessState}, #{applicationState}, #{createTime}, #{updateTime}, #{remark}, #{delFlag})
-    </insert>
-
-    <!--  插入拨付申请业务详情数据  -->
-    <insert id="insertAppropriationDetail">
-        insert into
-            fc_appropriation_detail (id, appropriation_id, building_account_id, building_number, building_name, account_balance, keep_percentage, keep_amount, apply_amount, create_time, update_time, del_flag)
-        values
-        <foreach collection="list" item="item" separator=",">
-            (#{item.id}, #{item.appropriationId}, #{item.buildingAccountId}, #{item.buildingNumber}, #{item.buildingName}, #{item.accountBalance}, #{item.keepPercentage}, #{item.keepAmount}, #{item.applyAmount}, #{item.createTime}, #{item.updateTime}, #{item.delFlag})
-        </foreach>
-    </insert>
-
-    <!--  插入拨付出账通知书  -->
-    <insert id="insertAppropriationOutgoing">
-        insert into
-            fc_appropriation_outgoing (id, business_number, bank_code, org_id, org_name, appropriation_id,application_type, project_account_id, project_name, appropriation_account_id, appropriation_bank, appropriation_name, appropriation_account, appropriation_open_address, collection_account_id, collection_bank, collection_name, collection_account, collection_open_address, apply_amount, purpose, type, appropriation_status, pdf_url, is_rescind, create_time, update_time, del_flag, remark)
-        values
-        <foreach collection="list" item="item" separator=",">
-            (#{item.id}, #{item.businessNumber}, #{item.bankCode}, #{item.orgId}, #{item.orgName}, #{item.appropriationId}, #{item.applicationType}, #{item.projectAccountId}, #{item.projectName}, #{item.appropriationAccountId}, #{item.appropriationBank}, #{item.appropriationName}, #{item.appropriationAccount}, #{item.appropriationOpenAddress}, #{item.collectionAccountId}, #{item.collectionBank}, #{item.collectionName}, #{item.collectionAccount}, #{item.collectionOpenAddress}, #{item.applyAmount}, #{item.purpose}, #{item.type}, #{item.appropriationStatus}, #{item.pdfUrl}, #{item.isRescind}, #{item.createTime}, #{item.updateTime}, #{item.delFlag}, #{item.remark})
-        </foreach>
-    </insert>
-
-    <!--  插入拨付入账通知书  -->
-    <insert id="insertAppropriationPosting">
-        insert into
-            fc_appropriation_posting (id, business_number, bank_code, org_id, org_name, appropriation_id, project_account_id, project_name, appropriation_account_id, appropriation_bank, appropriation_name, appropriation_account, appropriation_open_address, collection_account_id, collection_bank, collection_name, collection_account, collection_open_address, posting_amount, posting_status, purpose, is_rescind, create_time, update_time, del_flag, remark)
-        values
-        <foreach collection="list" item="item" separator=",">
-            (#{item.id}, #{item.businessNumber}, #{item.bankCode}, #{item.orgId}, #{item.orgName}, #{item.appropriationId}, #{item.projectAccountId}, #{item.projectName}, #{item.appropriationAccountId}, #{item.appropriationBank}, #{item.appropriationName}, #{item.appropriationAccount}, #{item.appropriationOpenAddress}, #{item.collectionAccountId}, #{item.collectionBank}, #{item.collectionName}, #{item.collectionAccount}, #{item.collectionOpenAddress}, #{item.postingAmount}, #{item.postingStatus}, #{item.purpose}, #{item.isRescind}, #{item.createTime}, #{item.updateTime}, #{item.delFlag}, #{item.remark})
-        </foreach>
-    </insert>
-</mapper>

target/classes/mapper/mysql/OrgMapper.xml

@@ -1,9 +0,0 @@
-<?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" >
-<mapper namespace="com.cool.bang.modules.mysql.mapper.OrgMapper">
-
-    <!--  通过mis库企业id 查询 zhfg库企业id  -->
-    <select id="selectOrgByMisid" resultType="com.cool.bang.modules.mysql.domain.Org">
-        select id,misid,qymc as orgName from p_qyxx where misid = #{misid} and state = 1
-    </select>
-</mapper>

target/classes/mapper/mysql/ProjectAccountMapper.xml

@@ -1,80 +0,0 @@
-<?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" >
-<mapper namespace="com.cool.bang.modules.mysql.mapper.ProjectAccountMapper">
-
-    <!-- 结果集 -->
-    <resultMap id="projectAccountMap" type="com.cool.bang.modules.mysql.domain.ProjectAccount">
-        <id property="id" column="id" jdbcType="BIGINT"/>
-        <result property="bankCode"                 column="bank_code"                   jdbcType="VARCHAR"/>
-        <result property="bankName"                 column="bank_name"                   jdbcType="VARCHAR"/>
-        <result property="orgId"                    column="org_id"                      jdbcType="INTEGER"/>
-        <result property="orgName"                  column="org_name"                    jdbcType="VARCHAR"/>
-        <result property="projectId"                column="project_id"                  jdbcType="BIGINT"/>
-        <result property="projectNumber"            column="project_number"              jdbcType="VARCHAR"/>
-        <result property="projectName"              column="project_name"                jdbcType="VARCHAR"/>
-        <result property="projectAddress"           column="project_address"             jdbcType="VARCHAR"/>
-        <result property="buildingTotal"            column="building_total"              jdbcType="INTEGER"/>
-        <result property="buildArea"                column="build_area"                  jdbcType="DECIMAL"/>
-        <result property="superviseAmount"          column="supervise_amount"            jdbcType="DECIMAL"/>
-        <result property="keepAmount"               column="keep_amount"                 jdbcType="DECIMAL"/>
-        <result property="accountId"                column="account_id"                  jdbcType="INTEGER"/>
-        <result property="trusteeshipBalance"       column="trusteeship_balance"         jdbcType="DECIMAL"/>
-        <result property="superviseBalance"         column="supervise_balance"           jdbcType="DECIMAL"/>
-        <result property="trusteeshipInTransitFund" column="trusteeship_in_transit_fund" jdbcType="DECIMAL"/>
-        <result property="superviseInTransitFund"   column="supervise_in_transit_fund"   jdbcType="DECIMAL"/>
-        <result property="buildCostId"              column="build_cost_id"               jdbcType="BIGINT"/>
-        <result property="buildCostName"            column="build_cost_name"             jdbcType="VARCHAR"/>
-        <result property="relieveDate"              column="relieve_date"                jdbcType="VARCHAR"/>
-        <result property="isFrozen"                 column="is_frozen"                   jdbcType="INTEGER"/>
-        <result property="accountType"              column="account_type"                jdbcType="INTEGER"/>
-        <result property="state"                    column="state"                       jdbcType="INTEGER"/>
-        <result property="delFlag"                  column="del_flag"                    jdbcType="TINYINT"/>
-    </resultMap>
-
-
-    <!--  插入项目虚拟户表数据  -->
-    <insert id="insertProjectAccount" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-        insert into
-            fc_project_account (id, aregid, bank_code, bank_name, org_id, org_name, project_id, project_number, project_name, project_address, building_total, build_area, supervise_amount, keep_amount, account_id, trusteeship_balance, supervise_balance, trusteeship_in_transit_fund, supervise_in_transit_fund, build_cost_id, build_cost_name, relieve_date, is_frozen, account_type, state, create_time, del_flag)
-        values
-            (#{id}, #{aregid}, #{bankCode}, #{bankName}, #{orgId}, #{orgName}, #{projectId}, #{projectNumber}, #{projectName}, #{projectAddress}, #{buildingTotal}, #{buildArea}, #{superviseAmount}, #{keepAmount}, #{accountId}, #{trusteeshipBalance}, #{superviseBalance}, #{trusteeshipInTransitFund}, #{superviseInTransitFund}, #{buildCostId}, #{buildCostName}, #{relieveDate},  #{isFrozen}, #{accountType}, #{state}, #{createTime}, #{delFlag})
-    </insert>
-
-    <!--  通过yszjjg-aregid查询  -->
-    <select id="selectByAregid" resultMap="projectAccountMap">
-        select
-            id, bank_code, bank_name, org_id, org_name, project_id, project_number, project_name, project_address, building_total, build_area, supervise_amount, keep_amount, account_id, trusteeship_balance, supervise_balance, trusteeship_in_transit_fund, supervise_in_transit_fund, build_cost_id, build_cost_name, relieve_date, is_frozen, account_type, state, create_time
-        from
-            fc_project_account
-        where
-            aregid = #{aregid}
-    </select>
-
-    <!-- 更新留存金额 -->
-    <update id="updateKeepAmount">
-        update fc_project_account
-        set
-            keep_amount = (select sum(keep_amount) from fc_building_account where project_account_id = #{id})
-        where id = #{id}
-    </update>
-
-    <!-- 更新留存金额 -->
-    <update id="updateTrusteeshipInTransit">
-        update fc_project_account
-        set
-            trusteeship_in_transit_fund = (select sum(in_transit_fund) from fc_building_account where project_account_id = #{id})
-        where id = #{id}
-    </update>
-
-    <!-- 更新留存金额 -->
-    <update id="updateSuperviseInTransit">
-        update fc_project_account
-        set
-            supervise_in_transit_fund = (select sum(in_transit_fund) from fc_building_account where project_account_id = #{id})
-        where id = #{id}
-    </update>
-
-    <select id="selectByAccount" resultMap="projectAccountMap">
-        select * from fc_project_account where project_id = #{id}
-    </select>
-</mapper>

target/classes/mapper/mysql/ProjectMapper.xml

@@ -1,45 +0,0 @@
-<?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" >
-<mapper namespace="com.cool.bang.modules.mysql.mapper.ProjectMapper">
-
-    <resultMap id="resultMap" type="com.cool.bang.modules.mysql.domain.Project">
-        <id property="id"                          column="id"                           jdbcType="BIGINT"/>
-        <result property="orgId"                   column="org_id"                       jdbcType="INTEGER"/>
-        <result property="orgName"                 column="org_name"                     jdbcType="VARCHAR"/>
-        <result property="projectNumber"           column="project_number"               jdbcType="VARCHAR"/>
-        <result property="projectName"             column="project_name"                 jdbcType="VARCHAR"/>
-        <result property="projectAddress"          column="project_address"              jdbcType="VARCHAR"/>
-        <result property="buildArea"               column="build_area"                   jdbcType="DECIMAL"/>
-        <result property="buildingTotal"           column="building_total"               jdbcType="INTEGER"/>
-        <result property="houseTotal"              column="house_total"                  jdbcType="INTEGER"/>
-        <result property="buildCostId"             column="build_cost_id"                jdbcType="BIGINT"/>
-        <result property="buildCostName"           column="build_cost_name"              jdbcType="VARCHAR"/>
-        <result property="adjustmentPercentage"    column="adjustment_percentage"        jdbcType="DECIMAL"/>
-        <result property="bankPercentage"          column="bank_percentage"              jdbcType="DECIMAL"/>
-        <result property="isFrozen"                column="is_frozen"                    jdbcType="INTEGER"/>
-        <result property="type"                    column="type"                         jdbcType="INTEGER"/>
-        <result property="state"                   column="state"                        jdbcType="INTEGER"/>
-        <result property="createTime"              column="create_time"                  jdbcType="TIMESTAMP"/>
-        <result property="delFlag"                 column="del_flag"                     jdbcType="TINYINT"/>
-    </resultMap>
-
-    <!--  插入项目表数据  -->
-    <insert id="insertProject">
-        insert into
-            fc_project (id, org_id, org_name, project_number, project_name, project_address, build_area, building_total, house_total, build_cost_id, build_cost_name, adjustment_percentage, bank_percentage, is_frozen, type, state, create_time, del_flag)
-        values
-        <foreach collection="list" item="item" separator=",">
-            (#{item.id},#{item.orgId},#{item.orgName},#{item.projectNumber},#{item.projectName},#{item.projectAddress},#{item.buildArea},#{item.buildingTotal},#{item.houseTotal},#{item.buildCostId},#{item.buildCostName},#{item.adjustmentPercentage},#{item.bankPercentage},#{item.isFrozen},#{item.type}, #{item.state}, #{item.createTime}, #{item.delFlag})
-        </foreach>
-    </insert>
-
-    <select id="selectByProjectNumber" resultMap="resultMap">
-        select * from fc_project where project_number = #{projectNumber}
-    </select>
-
-    <select id="selectProjectHouseTotal" resultType="java.lang.Integer">
-        select zts from p_lpb_xmxx where xmbh = #{projectNumber}
-    </select>
-
-
-</mapper>