Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

applications/money/money-server/src/main/java/com/usoftchina/saas/money/controller/OthspengdingsController.java

@@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.*;
  * @date 2018/10/24 22:15
  **/
 @RestController
-@RequestMapping("/othspengdings")
+@RequestMapping("/othspendings")
 public class OthspengdingsController {
     @Autowired
     private OthspendingsService othspendingsService;

applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Banksubledger.java

@@ -162,23 +162,4 @@ public class Banksubledger extends CommonBaseEntity implements Serializable {
         this.bl_remark = bl_remark == null ? null : bl_remark.trim();
     }
 
-    @Override
-    public void setCreatorId(long creatorId) {
-
-    }
-
-    @Override
-    public void setUpdaterId(long updaterId) {
-
-    }
-
-    @Override
-    public long getCompanyId() {
-        return 0;
-    }
-
-    @Override
-    public void setCompanyId(long companyId) {
-
-    }
 }

applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Fundtransferdetail.java

@@ -196,4 +196,29 @@ public class Fundtransferdetail extends CommonBaseEntity implements Serializable
     public void setFtd_text5(String ftd_text5) {
         this.ftd_text5 = ftd_text5;
     }
+
+    @Override
+    public String toString() {
+        return "Fundtransferdetail{" +
+                "ftd_ftid=" + ftd_ftid +
+                ", ftd_detno=" + ftd_detno +
+                ", ftd_ym=" + ftd_ym +
+                ", ftd_bankid=" + ftd_bankid +
+                ", ftd_bankcode='" + ftd_bankcode + '\'' +
+                ", ftd_bankname='" + ftd_bankname + '\'' +
+                ", ftd_inbankid=" + ftd_inbankid +
+                ", ftd_inbankcode='" + ftd_inbankcode + '\'' +
+                ", ftd_inbankname='" + ftd_inbankname + '\'' +
+                ", ftd_nowbalance=" + ftd_nowbalance +
+                ", ftd_paymethod='" + ftd_paymethod + '\'' +
+                ", ftd_paycode='" + ftd_paycode + '\'' +
+                ", ftd_remark='" + ftd_remark + '\'' +
+                ", updatedate=" + updatedate +
+                ", ftd_text1='" + ftd_text1 + '\'' +
+                ", ftd_text2='" + ftd_text2 + '\'' +
+                ", ftd_text3='" + ftd_text3 + '\'' +
+                ", ftd_text4='" + ftd_text4 + '\'' +
+                ", ftd_text5='" + ftd_text5 + '\'' +
+                '}';
+    }
 }

applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/FundtransferServiceImpl.java

@@ -43,6 +43,8 @@ public class FundtransferServiceImpl implements FundtransferService {
         Fundtransfer fundtransfer = fundtran.getMain();
         List<Fundtransferdetail> fundtransferdetails = fundtran.getItems();
 
+        System.out.println("fun:"+fundtransferdetails);
+
         String ft_code = fundtransfer.getFt_code();
 
         //编号校验
@@ -65,7 +67,7 @@ public class FundtransferServiceImpl implements FundtransferService {
         Iterator isdet = fundtransferdetails.iterator();
         while (isdet.hasNext()){
             Fundtransferdetail fundtransferdetail= (Fundtransferdetail) isdet.next();
-            fundtransfer.setCompanyId(BaseContextHolder.getCompanyId());
+            fundtransferdetail.setCompanyId(BaseContextHolder.getCompanyId());
             fundtransferdetail.setFtd_ftid(Math.toIntExact(id));
             if (fundtransferdetail.getId() > 0 ){
                 fundtransferdetailMapper.updateByPrimaryKey(fundtransferdetail);

applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/OthspendingsServiceImpl.java

@@ -55,14 +55,18 @@ public class OthspendingsServiceImpl implements OthspendingsService {
         if (othspendings.getId() > 0){
             othspendingsMapper.updateByPrimaryKeySelective(othspendings);
         }else {
-            othspendingsMapper.insert(othspendings);
+            othspendings.setCompanyId(BaseContextHolder.getCompanyId());
+            othspendingsMapper.insertSelective(othspendings);
+            id = othspendings.getId();
         }
 
         Iterator isdet = othspendingsdetails.iterator();
         while (isdet.hasNext()){
             Othspendingsdetail othspendingsdetail = (Othspendingsdetail) isdet.next();
-            if (othspendingsdetail.getOsd_orid() > 0 ){
-                othspendingsdetailMapper.updateByPrimaryKey(othspendingsdetail);
+            othspendingsdetail.setOsd_orid(Math.toIntExact(id));
+            othspendingsdetail.setCompanyId(BaseContextHolder.getCompanyId());
+            if (othspendingsdetail.getId() > 0 ){
+                othspendingsdetailMapper.updateByPrimaryKeySelective(othspendingsdetail);
             }else {
                 othspendingsdetailMapper.insertSelective(othspendingsdetail);
             }
@@ -138,7 +142,7 @@ public class OthspendingsServiceImpl implements OthspendingsService {
         Long companyId = BaseContextHolder.getCompanyId();
         Integer count = "0".equals(String.valueOf(id)) ? othspendingsMapper.validateCodeWhenInsert(code, companyId) :
                 othspendingsMapper.validateCodeWhenUpdate(code, id, companyId);
-        return maxnumberService.pushMaxnubmer(count, code, BillCodeSeq.OTHRECEIPTS.getCaller()).getData();
+        return maxnumberService.pushMaxnubmer(count, code, BillCodeSeq.OTHSPENDINGS.getCaller()).getData();
     }
 
     private List<Othspendings> getListByMode(ListReqDTO req) {

applications/money/money-server/src/main/resources/mapper/FundtransferdetailMapper.xml

@@ -16,7 +16,7 @@
     <result column="ftd_paymethod" property="ftd_paymethod" jdbcType="VARCHAR" />
     <result column="ftd_paycode" property="ftd_paycode" jdbcType="VARCHAR" />
     <result column="ftd_remark" property="ftd_remark" jdbcType="VARCHAR" />
-    <result column="companyId" property="companyId" jdbcType="INTEGER" />
+    <result column="companyid" property="companyId" jdbcType="INTEGER" />
     <result column="updaterId" property="updaterId" jdbcType="INTEGER" />
     <result column="updatedate" property="updatedate" jdbcType="TIMESTAMP" />
     <result column="ftd_text1" property="ftd_text1" jdbcType="VARCHAR" />
@@ -28,13 +28,13 @@
   <sql id="Base_Column_List" >
     ftd_id, ftd_ftid, ftd_detno, ftd_ym, ftd_bankid, ftd_bankcode, ftd_bankname, ftd_inbankid, 
     ftd_inbankcode, ftd_inbankname, ftd_nowbalance, ftd_paymethod, ftd_paycode, ftd_remark, 
-    companyId, updaterId, updatedate, ftd_text1, ftd_text2, ftd_text3, ftd_text4, ftd_text5
+    companyid, updaterId, updatedate, ftd_text1, ftd_text2, ftd_text3, ftd_text4, ftd_text5
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select 
     <include refid="Base_Column_List" />
     from fundtransferdetail
-    where ftd_id = #{id,jdbcType=INTEGER}
+    where ftd_ftid = #{id,jdbcType=INTEGER}
   </select>
 
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
@@ -52,7 +52,7 @@
       ftd_ym, ftd_bankid, ftd_bankcode, 
       ftd_bankname, ftd_inbankid, ftd_inbankcode, 
       ftd_inbankname, ftd_nowbalance, ftd_paymethod, 
-      ftd_paycode, ftd_remark, companyId, 
+      ftd_paycode, ftd_remark, companyid,
       updaterId, updatedate, ftd_text1, 
       ftd_text2, ftd_text3, ftd_text4, 
       ftd_text5)
@@ -108,7 +108,7 @@
         ftd_remark,
       </if>
       <if test="companyId != null" >
-        companyId,
+        companyid,
       </if>
       <if test="updaterId != null" >
         updaterId,
@@ -241,7 +241,7 @@
         ftd_remark = #{ftd_remark,jdbcType=VARCHAR},
       </if>
       <if test="companyId != null" >
-        companyId = #{companyId,jdbcType=INTEGER},
+        companyid = #{companyId,jdbcType=INTEGER},
       </if>
       <if test="updaterId != null" >
         updaterId = #{updaterId,jdbcType=INTEGER},
@@ -282,7 +282,7 @@
       ftd_paymethod = #{ftdPaymethod,jdbcType=VARCHAR},
       ftd_paycode = #{ftdPaycode,jdbcType=VARCHAR},
       ftd_remark = #{ftdRemark,jdbcType=VARCHAR},
-      companyId = #{companyId,jdbcType=INTEGER},
+      companyid = #{companyId,jdbcType=INTEGER},
       updaterId = #{updaterid,jdbcType=INTEGER},
       updatedate = #{updatedate,jdbcType=TIMESTAMP},
       ftd_text1 = #{ftdText1,jdbcType=VARCHAR},

applications/money/money-server/src/main/resources/mapper/OthreceiptsdetailMapper.xml

@@ -26,7 +26,7 @@
     select 
     <include refid="Base_Column_List" />
     from othreceiptsdetail
-    where ord_id = #{id,jdbcType=INTEGER}
+    where ord_orid = #{id,jdbcType=INTEGER}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
     delete from othreceiptsdetail

applications/money/money-server/src/main/resources/mapper/OthspendingsMapper.xml

@@ -66,219 +66,223 @@
   <insert id="insertSelective" parameterType="com.usoftchina.saas.money.po.Othspendings" >
     insert into othspendings
     <trim prefix="(" suffix=")" suffixOverrides="," >
-      <if test="osCode != null" >
+
+      <if test="os_code != null" >
         os_code,
       </if>
-      <if test="osDate != null" >
+      <if test="os_date != null" >
         os_date,
       </if>
-      <if test="osVendid != null" >
+      <if test="os_vendid != null" >
         os_vendid,
       </if>
-      <if test="osVendcode != null" >
+      <if test="os_vendcode != null" >
         os_vendcode,
       </if>
-      <if test="osVendname != null" >
+      <if test="os_vendname != null" >
         os_vendname,
       </if>
-      <if test="osBankid != null" >
+      <if test="os_bankid != null" >
         os_bankid,
       </if>
-      <if test="osBankcode != null" >
+      <if test="os_bankcode != null" >
         os_bankcode,
       </if>
-      <if test="osBankname != null" >
+      <if test="os_bankname != null" >
         os_bankname,
       </if>
-      <if test="osAmount != null" >
+      <if test="os_amount != null" >
         os_amount,
       </if>
-      <if test="osRecorderid != null" >
+      <if test="os_recorderid != null" >
         os_recorderid,
       </if>
-      <if test="osRecorder != null" >
+      <if test="os_recorder != null" >
         os_recorder,
       </if>
-      <if test="osRecorddate != null" >
+      <if test="os_recorddate != null" >
         os_recorddate,
       </if>
-      <if test="osStatus != null" >
+      <if test="os_status != null" >
         os_status,
       </if>
-      <if test="osStatuscode != null" >
+      <if test="os_statuscode != null" >
         os_statuscode,
       </if>
-      <if test="osRemark != null" >
+      <if test="os_remark != null" >
         os_remark,
       </if>
       <if test="companyId != null" >
         companyId,
       </if>
-      <if test="updaterid != null" >
+      <if test="updaterId != null" >
         updaterId,
       </if>
       <if test="updatedate != null" >
         updatedate,
       </if>
-      <if test="osText1 != null" >
+      <if test="os_text1 != null" >
         os_text1,
       </if>
-      <if test="osText2 != null" >
+      <if test="os_text2 != null" >
         os_text2,
       </if>
-      <if test="osText3 != null" >
+      <if test="os_text3 != null" >
         os_text3,
       </if>
-      <if test="osText4 != null" >
+      <if test="os_text4 != null" >
         os_text4,
       </if>
-      <if test="osText5 != null" >
+      <if test="os_text5 != null" >
         os_text5,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
-      <if test="osCode != null" >
-        #{osCode,jdbcType=VARCHAR},
+      <if test="os_code != null" >
+        #{os_code,jdbcType=VARCHAR},
       </if>
-      <if test="osDate != null" >
-        #{osDate,jdbcType=TIMESTAMP},
+      <if test="os_date != null" >
+        #{os_date,jdbcType=TIMESTAMP},
       </if>
-      <if test="osVendid != null" >
-        #{osVendid,jdbcType=INTEGER},
+      <if test="os_vendid != null" >
+        #{os_vendid,jdbcType=INTEGER},
       </if>
-      <if test="osVendcode != null" >
-        #{osVendcode,jdbcType=VARCHAR},
+      <if test="os_vendcode != null" >
+        #{os_vendcode,jdbcType=VARCHAR},
       </if>
-      <if test="osVendname != null" >
-        #{osVendname,jdbcType=VARCHAR},
+      <if test="os_vendname != null" >
+        #{os_vendname,jdbcType=VARCHAR},
       </if>
-      <if test="osBankid != null" >
-        #{osBankid,jdbcType=INTEGER},
+      <if test="os_bankid != null" >
+        #{os_bankid,jdbcType=INTEGER},
       </if>
-      <if test="osBankcode != null" >
-        #{osBankcode,jdbcType=VARCHAR},
+      <if test="os_bankcode != null" >
+        #{os_bankcode,jdbcType=VARCHAR},
       </if>
-      <if test="osBankname != null" >
-        #{osBankname,jdbcType=VARCHAR},
+      <if test="os_bankname != null" >
+        #{os_bankname,jdbcType=VARCHAR},
       </if>
-      <if test="osAmount != null" >
-        #{osAmount,jdbcType=DOUBLE},
+      <if test="os_amount != null" >
+        #{os_amount,jdbcType=DOUBLE},
       </if>
-      <if test="osRecorderid != null" >
-        #{osRecorderid,jdbcType=INTEGER},
+      <if test="os_recorderid != null" >
+        #{os_recorderid,jdbcType=INTEGER},
       </if>
-      <if test="osRecorder != null" >
-        #{osRecorder,jdbcType=VARCHAR},
+      <if test="os_recorder != null" >
+        #{os_recorder,jdbcType=VARCHAR},
       </if>
-      <if test="osRecorddate != null" >
-        #{osRecorddate,jdbcType=TIMESTAMP},
+      <if test="os_recorddate != null" >
+        #{os_recorddate,jdbcType=TIMESTAMP},
       </if>
-      <if test="osStatus != null" >
-        #{osStatus,jdbcType=INTEGER},
+      <if test="os_status != null" >
+        #{os_status,jdbcType=VARCHAR},
       </if>
-      <if test="osStatuscode != null" >
-        #{osStatuscode,jdbcType=DECIMAL},
+      <if test="os_statuscode != null" >
+        #{os_statuscode,jdbcType=VARCHAR},
       </if>
-      <if test="osRemark != null" >
-        #{osRemark,jdbcType=VARCHAR},
+      <if test="os_remark != null" >
+        #{os_remark,jdbcType=VARCHAR},
       </if>
       <if test="companyId != null" >
         #{companyId,jdbcType=INTEGER},
       </if>
-      <if test="updaterid != null" >
-        #{updaterid,jdbcType=INTEGER},
+      <if test="updaterId != null" >
+        #{updaterId,jdbcType=INTEGER},
       </if>
       <if test="updatedate != null" >
         #{updatedate,jdbcType=TIMESTAMP},
       </if>
-      <if test="osText1 != null" >
-        #{osText1,jdbcType=VARCHAR},
+      <if test="os_text1 != null" >
+        #{os_text1,jdbcType=VARCHAR},
       </if>
-      <if test="osText2 != null" >
-        #{osText2,jdbcType=VARCHAR},
+      <if test="os_text2 != null" >
+        #{os_text2,jdbcType=VARCHAR},
       </if>
-      <if test="osText3 != null" >
-        #{osText3,jdbcType=VARCHAR},
+      <if test="os_text3 != null" >
+        #{os_text3,jdbcType=VARCHAR},
       </if>
-      <if test="osText4 != null" >
-        #{osText4,jdbcType=VARCHAR},
+      <if test="os_text4 != null" >
+        #{os_text4,jdbcType=VARCHAR},
       </if>
-      <if test="osText5 != null" >
-        #{osText5,jdbcType=VARCHAR},
+      <if test="os_text5 != null" >
+        #{os_text5,jdbcType=VARCHAR},
       </if>
     </trim>
+    <selectKey resultType="Long" keyProperty="id" order="AFTER">
+      SELECT LAST_INSERT_ID()
+    </selectKey>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.money.po.Othspendings" >
     update othspendings
     <set >
-      <if test="osCode != null" >
-        os_code = #{osCode,jdbcType=VARCHAR},
+      <if test="os_code != null" >
+        os_code = #{os_code,jdbcType=VARCHAR},
       </if>
-      <if test="osDate != null" >
-        os_date = #{osDate,jdbcType=TIMESTAMP},
+      <if test="os_date != null" >
+        os_date = #{os_date,jdbcType=TIMESTAMP},
       </if>
-      <if test="osVendid != null" >
-        os_vendid = #{osVendid,jdbcType=INTEGER},
+      <if test="os_vendid != null" >
+        os_vendid = #{os_vendid,jdbcType=INTEGER},
       </if>
-      <if test="osVendcode != null" >
-        os_vendcode = #{osVendcode,jdbcType=VARCHAR},
+      <if test="os_vendcode != null" >
+        os_vendcode = #{os_vendcode,jdbcType=VARCHAR},
       </if>
-      <if test="osVendname != null" >
-        os_vendname = #{osVendname,jdbcType=VARCHAR},
+      <if test="os_vendname != null" >
+        os_vendname = #{os_vendname,jdbcType=VARCHAR},
       </if>
-      <if test="osBankid != null" >
-        os_bankid = #{osBankid,jdbcType=INTEGER},
+      <if test="os_bankid != null" >
+        os_bankid = #{os_bankid,jdbcType=INTEGER},
       </if>
-      <if test="osBankcode != null" >
-        os_bankcode = #{osBankcode,jdbcType=VARCHAR},
+      <if test="os_bankcode != null" >
+        os_bankcode = #{os_bankcode,jdbcType=VARCHAR},
       </if>
-      <if test="osBankname != null" >
-        os_bankname = #{osBankname,jdbcType=VARCHAR},
+      <if test="os_bankname != null" >
+        os_bankname = #{os_bankname,jdbcType=VARCHAR},
       </if>
-      <if test="osAmount != null" >
-        os_amount = #{osAmount,jdbcType=DOUBLE},
+      <if test="os_amount != null" >
+        os_amount = #{os_amount,jdbcType=DOUBLE},
       </if>
-      <if test="osRecorderid != null" >
-        os_recorderid = #{osRecorderid,jdbcType=INTEGER},
+      <if test="os_recorderid != null" >
+        os_recorderid = #{os_recorderid,jdbcType=INTEGER},
       </if>
-      <if test="osRecorder != null" >
-        os_recorder = #{osRecorder,jdbcType=VARCHAR},
+      <if test="os_recorder != null" >
+        os_recorder = #{os_recorder,jdbcType=VARCHAR},
       </if>
-      <if test="osRecorddate != null" >
-        os_recorddate = #{osRecorddate,jdbcType=TIMESTAMP},
+      <if test="os_recorddate != null" >
+        os_recorddate = #{os_recorddate,jdbcType=TIMESTAMP},
       </if>
-      <if test="osStatus != null" >
-        os_status = #{osStatus,jdbcType=INTEGER},
+      <if test="os_status != null" >
+        os_status = #{os_status,jdbcType=VARCHAR},
       </if>
-      <if test="osStatuscode != null" >
-        os_statuscode = #{osStatuscode,jdbcType=DECIMAL},
+      <if test="os_statuscode != null" >
+        os_statuscode = #{os_statuscode,jdbcType=VARCHAR},
       </if>
-      <if test="osRemark != null" >
-        os_remark = #{osRemark,jdbcType=VARCHAR},
+      <if test="os_remark != null" >
+        os_remark = #{os_remark,jdbcType=VARCHAR},
       </if>
       <if test="companyId != null" >
         companyId = #{companyId,jdbcType=INTEGER},
       </if>
-      <if test="updaterid != null" >
-        updaterId = #{updaterid,jdbcType=INTEGER},
+      <if test="updaterId != null" >
+        updaterId = #{updaterId,jdbcType=INTEGER},
       </if>
       <if test="updatedate != null" >
         updatedate = #{updatedate,jdbcType=TIMESTAMP},
       </if>
-      <if test="osText1 != null" >
-        os_text1 = #{osText1,jdbcType=VARCHAR},
+      <if test="os_text1 != null" >
+        os_text1 = #{os_text1,jdbcType=VARCHAR},
       </if>
-      <if test="osText2 != null" >
-        os_text2 = #{osText2,jdbcType=VARCHAR},
+      <if test="os_text2 != null" >
+        os_text2 = #{os_text2,jdbcType=VARCHAR},
       </if>
-      <if test="osText3 != null" >
-        os_text3 = #{osText3,jdbcType=VARCHAR},
+      <if test="os_text3 != null" >
+        os_text3 = #{os_text3,jdbcType=VARCHAR},
       </if>
-      <if test="osText4 != null" >
-        os_text4 = #{osText4,jdbcType=VARCHAR},
+      <if test="os_text4 != null" >
+        os_text4 = #{os_text4,jdbcType=VARCHAR},
       </if>
-      <if test="osText5 != null" >
-        os_text5 = #{osText5,jdbcType=VARCHAR},
+      <if test="os_text5 != null" >
+        os_text5 = #{os_text5,jdbcType=VARCHAR},
       </if>
     </set>
     where os_id = #{id,jdbcType=INTEGER}

applications/money/money-server/src/main/resources/mapper/OthspendingsdetailMapper.xml

@@ -26,7 +26,7 @@
     select 
     <include refid="Base_Column_List" />
     from othspendingsdetail
-    where osd_id = #{osd_orid,jdbcType=INTEGER}
+    where osd_orid = #{id,jdbcType=INTEGER}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
     delete from othspendingsdetail
@@ -142,6 +142,9 @@
         #{osd_text5,jdbcType=VARCHAR},
       </if>
     </trim>
+    <selectKey resultType="Long" keyProperty="id" order="AFTER">
+      SELECT LAST_INSERT_ID()
+    </selectKey>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.money.po.Othspendingsdetail" >
     update othspendingsdetail

applications/money/money-server/src/main/resources/mapper/PaybalancedetailMapper.xml

@@ -31,7 +31,7 @@
     select
     <include refid="Base_Column_List" />
     from paybalancedetail
-    where pbd_id = #{id,jdbcType=INTEGER}
+    where pbd_pbid = #{id,jdbcType=INTEGER}
   </select>
   <delete id="deleteItem" parameterType="java.lang.Integer" >
     delete from paybalancedetail

applications/money/money-server/src/main/resources/mapper/RecbalancedetMapper.xml

@@ -89,7 +89,7 @@
     select 
     <include refid="Base_Column_List" />
     from recbalancedet
-    where rd_id = #{id,jdbcType=INTEGER}
+    where rd_rbid = #{id,jdbcType=INTEGER}
   </select>
   <delete id="deleteItem" parameterType="java.lang.Integer">
     delete from recbalancedet