代码提交

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

@@ -92,26 +92,25 @@ public class TrusteeshipBusiness {
     public TrusteeshipBusiness() {}
 
     public TrusteeshipBusiness(Project project,Org org,Bxmxy bxmxy) {
-        this.businessNumber = bxmxy.getYwbh();
-        this.orgId = org.getId();
-        this.orgName = org.getOrgName();
+        this.flowNumber = "202212191455096304";
         this.projectId = project.getId();
         this.projectName = project.getProjectName();
+        this.buildCostId = project.getBuildCostId();
+        this.buildCostName = project.getBuildCostName();
+
+        this.orgId = org.getId();
+        this.orgName = org.getOrgName();
+
+        this.businessNumber = bxmxy.getYwbh();
         this.projectNumber = bxmxy.getXmbh();
         this.projectAddress = bxmxy.getXmzl();
         this.buildArea = bxmxy.getJzmj();
-        this.buildCostId = project.getBuildCostId();
-        this.buildCostName = project.getBuildCostName();
         this.legalPerson = bxmxy.getFr();
         this.legalPhone = bxmxy.getFrdh();
         this.operator = bxmxy.getLxr();
         this.operatorPhone = bxmxy.getLxdh();
-
-        this.flowNumber = "202212191455096304";
-
         this.submitDate = bxmxy.getSqsj();
         this.businessState = stateSwitch(bxmxy.getBljd());
-
         this.pdfUrl = null;
         this.delFlag = 1;
         this.createTime = DateUtil.strToDate(bxmxy.getSqsj(),"yyyy-MM-dd HH:mm:ss");

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

@@ -0,0 +1,229 @@
+package com.cool.bang.modules.mysql.domain.mysql;
+
+import com.cool.bang.modules.oracle.domain.OracleUser;
+
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+
+/**
+
+ *
+ * @author PeiZhi Guo
+ * 2021-2-18 10:52
+ */
+public class MysqlUser {
+
+    private Long id;
+
+    private Integer orgId; //企业id 或支行id
+
+    private Integer userType; //超级管理员0 监管单位1 开发单位2 托管银行3 托管机构4
+
+    private String  username;
+
+    private String  password;
+
+    private String  realName; // 用户昵称
+
+    private String  avatar; // 用户头像
+
+    private Integer sex;
+
+    private String  phone;
+
+    private String  email;
+
+    private String  token;
+
+    private Long loginTime;
+
+    private Long expireTime;
+
+    private boolean enable; // 启用标识 0禁用 1正常
+
+    private boolean delFlag; // 删除标识 0删除 1正常
+
+    private Long createBy;
+
+    private Long updateBy;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    private String remark;
+
+
+    public void init(OracleUser oracle) {
+        this.orgId = null;
+        this.userType = oracle.getUsertype();
+        this.username = oracle.getLoginname();
+        this.password = "";
+        this.realName = oracle.getUsername();
+        this.avatar = null;
+        this.sex = oracle.convertSex();
+        this.phone = oracle.getTel();
+        this.email = null;
+        this.enable = true;
+        this.delFlag = true;
+        this.createTime = new Date();
+        this.updateTime = new Date();
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Integer getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(Integer orgId) {
+        this.orgId = orgId;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public String getRealName() {
+        return realName;
+    }
+
+    public void setRealName(String realName) {
+        this.realName = realName;
+    }
+
+    public String getAvatar() {
+        return avatar;
+    }
+
+    public void setAvatar(String avatar) {
+        this.avatar = avatar;
+    }
+
+    public Integer getSex() {
+        return sex;
+    }
+
+    public void setSex(Integer sex) {
+        this.sex = sex;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public String getToken() {
+        return token;
+    }
+
+    public void setToken(String token) {
+        this.token = token;
+    }
+
+    public Long getLoginTime() {
+        return loginTime;
+    }
+
+    public void setLoginTime(Long loginTime) {
+        this.loginTime = loginTime;
+    }
+
+    public Long getExpireTime() {
+        return expireTime;
+    }
+
+    public void setExpireTime(Long expireTime) {
+        this.expireTime = expireTime;
+    }
+
+    public void setEnable(boolean enable) {
+        this.enable = enable;
+    }
+
+    public boolean isEnable() {return enable; }
+
+    public void setDelFlag(boolean delFlag) {
+        this.delFlag = delFlag;
+    }
+
+    public boolean isDelFlag() { return delFlag; }
+
+    public Integer getUserType() {
+        return userType;
+    }
+
+    public void setUserType(Integer userType) {
+        this.userType = userType;
+    }
+
+    public Long getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(Long createBy) {
+        this.createBy = createBy;
+    }
+
+    public Long getUpdateBy() {
+        return updateBy;
+    }
+
+    public void setUpdateBy(Long updateBy) {
+        this.updateBy = updateBy;
+    }
+
+    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;
+    }
+}

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

@@ -50,4 +50,7 @@ public interface ProjectAccountMapper {
      * @return
      */
     ProjectAccount getInfoById(@Param("id") Long id);
+
+
+
 }

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

@@ -31,4 +31,19 @@ public interface ProjectMapper {
     Integer selectProjectHouseTotal(String projectNumber);
 
     int updateRelieve(Long projectId);
+
+    /**
+     * 更新项目监管楼幢数量
+     */
+    int updateBuildTotal();
+
+    /**
+     * 更新项目监管楼幢面积
+     */
+    int updateBuildArea();
+
+    /**
+     * 更新项目监管金额
+     */
+    int updateSuperviseAmount();
 }

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

@@ -0,0 +1,13 @@
+package com.cool.bang.modules.mysql.mapper;
+
+/**
+ * 描述：
+ *
+ * @author PeiZhi Guo
+ * 2023-3-6 15:46
+ */
+public interface UserMapper {
+
+
+    int insert();
+}

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

@@ -70,7 +70,7 @@ public class MySQLService {
     /**
      * 项目表 数据匹配
      */
-    public void project(){
+    public void project() {
         //对应YSZJJG--BXM表
 
         System.out.println("===============fc_project 数据匹配开始=================");
@@ -118,6 +118,10 @@ public class MySQLService {
         System.out.println("===============fc_project 数据匹配结束==插入"+i+"条数据==============");
     }
 
+    public void projectBuildingTotal () {
+
+    }
+
     /**
      * 账户表 数据匹配
      */
@@ -213,7 +217,9 @@ public class MySQLService {
             }
             System.out.println("*******************");
         }
-
+        // 更新楼幢相关数据
+        projectMapper.updateBuildArea();
+        projectMapper.updateBuildTotal();
         System.out.println("===============fc_project_account fc_building_account数据匹配结束==============");
     }
 

src/main/java/com/cool/bang/modules/oracle/domain/OracleUser.java

@@ -0,0 +1,137 @@
+package com.cool.bang.modules.oracle.domain;
+
+/**
+ * 用户
+ *
+ * @author PeiZhi Guo
+ * 2023-3-6 14:34
+ */
+public class OracleUser {
+
+    /**
+     * 登录名称
+     */
+    private String loginname;
+
+    /**
+     * 性别
+     */
+    private String sex;
+
+    /**
+     * 状态
+     */
+    private Integer state;
+
+    /**
+     * 电话
+     */
+    private String tel;
+
+    /**
+     * mis库主键
+     */
+    private String typecode;
+
+    /**
+     * 用户名称
+     */
+    private String username;
+
+    /**
+     * 用户类型 1企业 0 房管
+     */
+    private Integer usertype;
+
+    /**
+     * 企业编号
+     */
+    private String qybh;
+
+    /**
+     * 企业名称
+     */
+    private String qymc;
+
+    public int convertSex() {
+        if (this.sex.equals("男")) {
+            return 0;
+        }
+        if (this.sex.equals("女")) {
+            return 1;
+        }
+        return 2;
+    }
+
+    public String getLoginname() {
+        return loginname;
+    }
+
+    public void setLoginname(String loginname) {
+        this.loginname = loginname;
+    }
+
+    public String getSex() {
+        return sex;
+    }
+
+    public void setSex(String sex) {
+        this.sex = sex;
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public String getTel() {
+        return tel;
+    }
+
+    public void setTel(String tel) {
+        this.tel = tel;
+    }
+
+    public String getTypecode() {
+        return typecode;
+    }
+
+    public void setTypecode(String typecode) {
+        this.typecode = typecode;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public Integer getUsertype() {
+        return usertype;
+    }
+
+    public void setUsertype(Integer usertype) {
+        this.usertype = usertype;
+    }
+
+    public String getQybh() {
+        return qybh;
+    }
+
+    public void setQybh(String qybh) {
+        this.qybh = qybh;
+    }
+
+    public String getQymc() {
+        return qymc;
+    }
+
+    public void setQymc(String qymc) {
+        this.qymc = qymc;
+    }
+}

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

@@ -1,5 +1,6 @@
 package com.cool.bang.modules.oracle.mapper;
 
+import com.cool.bang.modules.oracle.domain.OracleUser;
 import com.cool.bang.modules.oracle.domain.po.*;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -31,4 +32,9 @@ public interface OracleMapper {
     List<BhtTrade> getTradeByBHTPayJKBH(@Param("jkbh") String jkbh);
 
     List<BDj> selectBDJInfo();
+
+    /**
+     * 用户查询
+     */
+    List<OracleUser> selectByUser();
 }

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

@@ -38,6 +38,18 @@
         update fc_project set state = 0 where id = #{id}
     </update>
 
+    <update id="updateBuildTotal">
+        update fc_project t set t.building_total = (select count(1) from fc_building_account where project_number = t.project_number)
+    </update>
+
+    <update id="updateBuildArea">
+        update fc_project t set t.build_area = (select sum(build_area) from fc_building_account where project_number = t.project_number)
+    </update>
+
+    <update id="updateSuperviseAmount">
+        update fc_project t set t.supervise_amount = (select sum(supervise_amount) from fc_building_account where project_number = t.project_number)
+    </update>
+
     <select id="selectByProjectNumber" resultMap="resultMap">
         select * from fc_project where project_number = #{projectNumber}
     </select>

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

@@ -0,0 +1,32 @@
+<?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.UserMapper">
+
+    <resultMap id="resultUserMap" type="com.cool.bang.modules.mysql.domain.mysql.MysqlUser">
+        <id property="id" column="id" jdbcType="BIGINT" />
+        <result property="orgId"      column="org_id"      jdbcType="BIGINT" />
+        <result property="userType"   column="user_type"   jdbcType="INTEGER" />
+        <result property="username"   column="username"    jdbcType="VARCHAR" />
+        <result property="password"   column="password"    jdbcType="VARCHAR" />
+        <result property="realName"   column="real_name"   jdbcType="VARCHAR" />
+        <result property="avatar"     column="avatar"      jdbcType="VARCHAR" />
+        <result property="sex"        column="sex"         jdbcType="INTEGER" />
+        <result property="phone"      column="phone"       jdbcType="VARCHAR" />
+        <result property="email"      column="email"       jdbcType="VARCHAR" />
+        <result property="enable"     column="enable"      jdbcType="TINYINT" />
+        <result property="createTime" column="create_time" jdbcType="TIMESTAMP" />
+        <result property="createBy"   column="create_by"   jdbcType="INTEGER" />
+        <result property="updateTime" column="update_time" jdbcType="TIMESTAMP" />
+        <result property="updateBy"   column="update_by"   jdbcType="INTEGER" />
+        <result property="remark"     column="remark"      jdbcType="VARCHAR" />
+        <result property="delFlag"    column="del_flag"    jdbcType="TINYINT" />
+    </resultMap>
+
+
+    <insert id="insert" parameterType="com.cool.bang.modules.mysql.domain.mysql.MysqlUser" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+        insert into sys_user
+        (org_id, user_type, username, password, real_name, avatar, sex, phone, email, enable, create_time, create_by, update_time, update_by, remark, del_flag)
+        values
+        (#{orgId},#{userType},#{username},#{password},#{realName},#{avatar},#{sex},#{phone},#{email},#{enable},sysdate(),#{createBy},sysdate(),#{updateBy},#{remark},#{delFlag})
+    </insert>
+</mapper>

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

@@ -3,6 +3,6 @@
 <mapper namespace="com.cool.bang.modules.oracle.mapper.BxmxyMapper">
 
     <select id="selectFromBxmxy" resultType="com.cool.bang.modules.oracle.domain.Bxmxy">
-        select t1.* from bxmxy t1 left join bxm t2 on t2.xmbh = t1.xmbh   where t1.state = 1 and t2.jgzt != 0
+        select t1.* from bxmxy t1 left join bxm t2 on t2.xmbh = t1.xmbh where t1.state = 1 and t1.bljd = 9 and t2.jgzt != 0
     </select>
 </mapper>

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

@@ -108,4 +108,10 @@
         WHERE dj.STATE = 1 AND (dj.TRADESTATE = 0 OR dj.TRADESTATE = 1 OR dj.TRADESTATE = 2)
     </select>
 
+    <!-- 用户 -->
+    <select id="selectByUser" resultType="com.cool.bang.modules.oracle.domain.OracleUser">
+        select t.loginname, t.sex, t.state, t.tel, t.typecode, t.username, t.usertype, t2.qybh, t2.qymc
+        from SUSER t left join BQY t2 on t2.qybh = t.TYPECODE where t.USERTYPE = 1 and t.state = 1 and t2.qyid is not null
+    </select>
+
 </mapper>

target/classes/mapper/oracle/OracleMapper.xml

@@ -60,5 +60,52 @@
         select * from progress where state = 1 and taskstate is not null
     </select>
 
+    <!-- 查询BHT-->
+    <select id="selectHtInfo" resultType="com.cool.bang.modules.oracle.domain.po.HtInfo">
+        select t1.*,t2.FWID,t3.FWBH
+        from BHT t1
+        left join BHTFW t2 ON  t1.HTID = t2.HTID and t2.STATE = 1
+        left join BFW t3 ON t3.FWID = t2.FWID and t3.STATE = 1
+        where t1.STATE = 1
+    </select>
+
+
+    <select id="selectHtPayInfo" resultType="com.cool.bang.modules.oracle.domain.po.HtPay">
+        SELECT
+            a.ACCOUNTNO,h.HTBH,hp.*
+        FROM BHTPAY hp
+                 LEFT JOIN ACCOUNT a ON hp.ACCOUNTID = a.ACCOUNTID
+                 LEFT JOIN BHT h ON hp.HTID = h.HTID
+        WHERE hp.STATE =1
+    </select>
+
+    <select id="getBhtPayTradeByBHTID" resultType="com.cool.bang.modules.oracle.domain.po.BhtTrade">
+        SELECT
+            t.ID AS tradeId,t.TRADEAMOUNT AS tradeAmount,p.PAYTYPE AS payType,p.ACCOUNTID AS AccountId,p.HTID AS htId,p.JKBH AS jkbh,p.JKJE AS jkje,
+               t.DJNUM AS djbh
+        FROM BHTPAY p
+            LEFT JOIN TRADE t ON p.JKBH = t.TRADENUM AND t.TRADESTATE = 1 AND (t.PAYTYPE = 1 OR t.PAYTYPE = 9)
+        WHERE p.HTID = #{htId} AND p.STATE = 1
+    </select>
+
+    <select id="getTradeByBHTPayJKBH" resultType="com.cool.bang.modules.oracle.domain.po.BhtTrade">
+        SELECT
+            t.ID AS tradeId,t.TRADEAMOUNT AS tradeAmount,t.DJNUM AS djbh,t.ZJJGFLAG,t.PAYTYPE AS payType
+        FROM TRADE t
+        WHERE t.TRADENUM = #{jkbh} AND t.TRADESTATE = 1 AND (t.PAYTYPE = 1 OR t.PAYTYPE = 9)
+    </select>
+
+    <select id="selectBDJInfo" resultType="com.cool.bang.modules.oracle.domain.po.BDj">
+        SELECT
+            tra.TRADEAMOUNT,dj.JKJE,ht.HTBH,
+            dj.DJID,hp.HTID,tra.TRADENUM,dj.GUAJIEPAYBH,dj.TRADESTATE,dj.DJBH,dj.ACCOUNTID,dj.BUYERCODE,
+            dj.BUYERNAME,dj.GUAJIEPAYBH,dj.QYBH,ht.LZBH,a.ACCOUNTNO
+        FROM BDJ dj
+            LEFT JOIN TRADE tra ON dj.DJBH = tra.DJNUM AND tra.PAYTYPE = 9 AND tra.TRADESTATE = 1
+            LEFT JOIN BHTPAY hp ON tra.TRADENUM = hp.JKBH AND hp.STATE = 1
+            LEFT JOIN ACCOUNT a ON hp.ACCOUNTID = a.ACCOUNTID
+            LEFT JOIN BHT ht ON ht.HTID = hp.HTID AND ht.STATE = 1
+        WHERE dj.STATE = 1 AND (dj.TRADESTATE = 0 OR dj.TRADESTATE = 1 OR dj.TRADESTATE = 2)
+    </select>
 
 </mapper>