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

applications/commons/commons-server/src/main/resources/application.yml

@@ -45,7 +45,7 @@ eureka:
   client:
     registryFetchIntervalSeconds: 5
     serviceUrl:
-      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.0.181:8500/eureka/
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.0.181:8510/eureka/
 server:
   port: 8920
   tomcat:

applications/document/document-server/src/main/resources/application.yml

@@ -47,8 +47,8 @@ eureka:
   client:
     registryFetchIntervalSeconds: 5
     serviceUrl:
-#      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.0.181:8500/eureka/
-      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.253.31:8500/eureka/
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.0.181:8510/eureka/
+#      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.253.31:8510/eureka/
 server:
   port: 9480
   tomcat:

applications/money/money-dto/pom.xml

@@ -24,6 +24,10 @@
             <artifactId>springfox-swagger2</artifactId>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>io.undertow</groupId>
+            <artifactId>undertow-servlet</artifactId>
+        </dependency>
     </dependencies>
 
 

applications/money/money-server/src/main/docker/Dockerfile

@@ -0,0 +1,6 @@
+FROM frolvlad/alpine-oraclejdk8:slim
+VOLUME /tmp
+ADD money-server-1.0.0-SNAPSHOT.jar app.jar
+RUN sh -c 'touch /app.jar'
+ENV JAVA_OPTS=""
+ENTRYPOINT [ "sh", "-c", "java $JAVA_OPTS -Djava.security.egd=file:/dev/./urandom -jar /app.jar" ]

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

@@ -3,6 +3,7 @@ package com.usoftchina.saas.money.controller;
 import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.base.Result;
 import com.usoftchina.saas.commons.dto.DocSavedDTO;
+import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.money.dto.VerificationFormDTO;
 import com.usoftchina.saas.money.dto.VerificationListDTO;
 import com.usoftchina.saas.money.dto.VerificationReqDTO;
@@ -34,8 +35,8 @@ public class VerificationController {
      * @return
      */
     @RequestMapping("/list")
-    public Result<PageInfo<VerificationList>> getListData(PageRequest page, VerificationReqDTO req) {
-        PageInfo<VerificationListDTO> listData = verificationService.getListData(page, req);
+    public Result<PageInfo<VerificationList>> getListData(PageRequest page, ListReqDTO req) {
+        PageInfo<VerificationList> listData = verificationService.getListData(page, req);
         return Result.success(listData);
     }
 

applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/VerificationListMapper.java

@@ -1,8 +1,7 @@
 package com.usoftchina.saas.money.mapper;
 
-import com.usoftchina.saas.money.dto.VerificationListDTO;
-import com.usoftchina.saas.money.dto.VerificationReqDTO;
 import com.usoftchina.saas.money.po.VerificationList;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -11,6 +10,6 @@ import java.util.List;
  * @createtime 2018-10-22 20:12
  */
 public interface VerificationListMapper {
-    List<VerificationListDTO> selectVerificationListByCondition(VerificationReqDTO reqDTO);
-    List<VerificationListDTO> selectVerificationBycondition(VerificationReqDTO reqDTO);
+    List<VerificationList> selectVerificationListByCondition(@Param("con") String con, @Param("companyId") Long companyId);
+    List<VerificationList> selectVerificationBycondition(@Param("con") String con,@Param("companyId") Long companyId);
 }

applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/VerificationdetMapper.java

@@ -38,4 +38,6 @@ public interface VerificationdetMapper extends CommonBaseMapper<Verificationdet>
     void batchUpdate(List<Verificationdet> list);
 
     int deleteByParentPrimaryKey(Long vd_vcid);
+
+    List<Verificationdet> selectByFK(Long vc_id);
 }

applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/VerificationdetailMapper.java

@@ -1,6 +1,7 @@
 package com.usoftchina.saas.money.mapper;
 
 import com.usoftchina.saas.base.mapper.CommonBaseMapper;
+import com.usoftchina.saas.money.po.Verificationdet;
 import com.usoftchina.saas.money.po.Verificationdetail;
 import java.util.List;
 
@@ -40,4 +41,6 @@ public interface VerificationdetailMapper extends CommonBaseMapper<Verificationd
     void batchUpdate(List<Verificationdetail> list);
 
     int deleteByParentPrimaryKey(Long vcd_vcid);
+
+    List<Verificationdetail> selectByFK(Long vc_id);
 }

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

@@ -302,4 +302,24 @@ public class Verification extends CommonBaseEntity implements Serializable {
     public void setVc_text5(String vc_text5) {
         this.vc_text5 = vc_text5 == null ? null : vc_text5.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/VerificationList.java

@@ -134,4 +134,5 @@ public class VerificationList extends CommonBaseEntity implements Serializable {
     private String vcd_text4;
 
     private String vcd_text5;
+
 }

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

@@ -2,9 +2,11 @@ package com.usoftchina.saas.money.service;
 
 import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.commons.dto.DocSavedDTO;
+import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.money.dto.VerificationFormDTO;
 import com.usoftchina.saas.money.dto.VerificationListDTO;
 import com.usoftchina.saas.money.dto.VerificationReqDTO;
+import com.usoftchina.saas.money.po.VerificationList;
 import com.usoftchina.saas.page.PageRequest;
 
 /**
@@ -18,7 +20,7 @@ public interface VerificationService {
      * @param page,req
      * @return
      */
-    PageInfo<VerificationListDTO> getListData(PageRequest page, VerificationReqDTO req);
+    PageInfo<VerificationList> getListData(PageRequest page, ListReqDTO req);
     /**
      * 获取核销表单
      *

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

@@ -5,6 +5,7 @@ import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.base.service.CommonBaseServiceImpl;
 import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.commons.dto.DocSavedDTO;
+import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.commons.exception.BizExceptionCode;
 import com.usoftchina.saas.commons.po.Operation;
 import com.usoftchina.saas.commons.service.MaxnumberService;
@@ -45,7 +46,7 @@ public class VerificationServiceImpl extends CommonBaseServiceImpl<VerificationM
 
 
     @Override
-    public PageInfo<VerificationListDTO> getListData(PageRequest page, VerificationReqDTO req) {
+    public PageInfo<VerificationList> getListData(PageRequest page, ListReqDTO req) {
         //设置默认分页
         if (null == page || page.getSize() == 0 || page.getNumber() == 0) {
             page = new PageRequest();
@@ -54,14 +55,19 @@ public class VerificationServiceImpl extends CommonBaseServiceImpl<VerificationM
         }
         PageHelper.startPage(page.getNumber(), page.getSize());
         //查询数据
-        List<VerificationListDTO> lists = new ArrayList<VerificationListDTO>();
+        List<VerificationList> lists = new ArrayList<VerificationList>();
+        Long companyId = BaseContextHolder.getCompanyId();
+        String con = req.getFinalCondition();
+        if (null == con) {
+            con = "1=1";
+        }
         if (null == req || StringUtils.isEmpty(req.getMode()) || "MAIN".equals(req.getMode())) {
-            lists = verificationListMapper.selectVerificationListByCondition(req);
+            lists = verificationListMapper.selectVerificationListByCondition(con, companyId);
         } else {
-            lists = verificationListMapper.selectVerificationBycondition(req);
+            lists = verificationListMapper.selectVerificationBycondition(con, companyId);
         }
         //取分页信息
-        PageInfo<VerificationListDTO> pageInfo = new PageInfo<VerificationListDTO>(lists);
+        PageInfo<VerificationList> pageInfo = new PageInfo<VerificationList>(lists);
         return pageInfo;
     }
 
@@ -74,25 +80,18 @@ public class VerificationServiceImpl extends CommonBaseServiceImpl<VerificationM
     public VerificationFormDTO getFormData(Long id) {
         VerificationFormDTO  verificationFormDTO = new VerificationFormDTO();
         //查询主表
-        Verification verification = getMapper().selectByPrimaryKey(id);
+        Verification verification = getMapper().selectByPrimaryKey(Integer.valueOf(String.valueOf(id)));
         VerificationDTO main = BeanMapper.map(verification,VerificationDTO.class);
-        //查询两个从表
-        VerificationdetExample verificationdetExample = new VerificationdetExample();
-        VerificationdetailExample verificationdetailExample = new VerificationdetailExample();
-        //明细1
-        VerificationdetExample.Criteria cta = verificationdetExample.createCriteria();
-        cta.andVd_idEqualTo(id.intValue());
-        List<Verificationdet> verificationdet = verificationdetMapper.selectByExample(verificationdetExample);
-        List<VerificationdetDTO> items1 = BeanMapper.mapList(verificationdet,VerificationdetDTO.class);
-        //明细2
-        VerificationdetailExample.Criteria cta2 = verificationdetailExample.createCriteria();
-        cta2.andVcd_vcidEqualTo(id.intValue());
-        List<Verificationdetail> verificationdetail = verificationdetailMapper.selectByExample(verificationdetailExample);
-        List<VerificationdetailDTO> items2 = BeanMapper.mapList(verificationdetail,VerificationdetailDTO.class);
 
+        List<Verificationdet> verificationdet = verificationdetMapper.selectByFK(id);
+        List<VerificationdetDTO> items1 = BeanMapper.mapList(verificationdet, VerificationdetDTO.class);
+
+        List<Verificationdetail> verificationdetail = verificationdetailMapper.selectByFK(id);
+        List<VerificationdetailDTO> items2 = BeanMapper.mapList(verificationdetail, VerificationdetailDTO.class);
         verificationFormDTO.setMain(main);
         verificationFormDTO.setItems1(items1);
         verificationFormDTO.setItems2(items2);
+
         return  verificationFormDTO;
     }
 

applications/money/money-server/src/main/resources/application.yml

@@ -6,7 +6,7 @@ spring:
       name: admin
       password: select111***
   datasource:
-    driver-class-name: com.mysql.jdbc.Driver
+    driver-class-name: com.mysql.cj.jdbc.Driver
     url: jdbc:mysql://192.168.253.12:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
     username: root
     password: select111***
@@ -44,7 +44,7 @@ eureka:
   client:
     registryFetchIntervalSeconds: 5
     serviceUrl:
-      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@localhost:8500/eureka/
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.0.181:8510/eureka/
 server:
   port: 8920
   tomcat:

applications/money/money-server/src/main/resources/config/application-docker.yml

@@ -0,0 +1,10 @@
+eureka:
+  instance:
+    hostname: saas-money-server
+    prefer-ip-address: false
+  client:
+    serviceUrl:
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@saas-eureka-server:8500/eureka/
+spring:
+  rabbitmq:
+    virtual-host: docker

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

@@ -1,6 +1,6 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.usoftchina.saas.money.mapper.VerificationListMapper" >
-    <resultMap id="BaseResultMap" type="com.usoftchina.saas.money.po.Verification" >
+    <resultMap id="BaseResultMap" type="com.usoftchina.saas.money.po.VerificationList" >
         <id column="vc_id" property="vc_id" jdbcType="INTEGER" />
         <result column="vc_code" property="vc_code" jdbcType="VARCHAR" />
         <result column="vc_kind" property="vc_kind" jdbcType="VARCHAR" />
@@ -25,19 +25,49 @@
         <result column="vc_status" property="vc_status" jdbcType="INTEGER" />
         <result column="vc_statuscode" property="vc_statuscode" jdbcType="DECIMAL" />
         <result column="vc_remark" property="vc_remark" jdbcType="VARCHAR" />
-        <result column="companyid" property="companyid" jdbcType="INTEGER" />
-        <result column="updaterId" property="updaterId" jdbcType="INTEGER" />
-        <result column="updatedate" property="updatedate" jdbcType="TIMESTAMP" />
         <result column="vc_text1" property="vc_text1" jdbcType="VARCHAR" />
         <result column="vc_text2" property="vc_text2" jdbcType="VARCHAR" />
         <result column="vc_text3" property="vc_text3" jdbcType="VARCHAR" />
         <result column="vc_text4" property="vc_text4" jdbcType="VARCHAR" />
         <result column="vc_text5" property="vc_text5" jdbcType="VARCHAR" />
+        <result column="companyId" property="companyId" jdbcType="BIGINT" />
+        <result column="updatemanid" property="updaterId" jdbcType="INTEGER" />
+        <result column="updaterTime" property="updaterTime" jdbcType="TIMESTAMP" />
+        <result column="vd_id" property="vd_id" jdbcType="INTEGER" />
+        <result column="vd_vcid" property="vd_vcid" jdbcType="INTEGER" />
+        <result column="vd_detno" property="vd_detno" jdbcType="INTEGER" />
+        <result column="vd_ym" property="vd_ym" jdbcType="INTEGER" />
+        <result column="vd_slid" property="vd_slid" jdbcType="INTEGER" />
+        <result column="vd_slcode" property="vd_slcode" jdbcType="VARCHAR" />
+        <result column="vd_slkind" property="vd_slkind" jdbcType="VARCHAR" />
+        <result column="vd_amount" property="vd_amount" jdbcType="DOUBLE" />
+        <result column="vd_nowbalance" property="vd_nowbalance" jdbcType="DOUBLE" />
+        <result column="vd_remark" property="vd_remark" jdbcType="VARCHAR" />
+
     </resultMap>
-    <select id="selectPurchaseListByCondition" parameterType="com.usoftchina.saas.money.dto.VerificationReqDTO" resultMap="BaseResultMap">
+    <select id="selectVerificationListByCondition"  resultMap="BaseResultMap">
         select  *  from verification left join verificationdet on vc_id=vd_vcid left join verificationdetail on vc_id=vcd_vcid
         <where>
-            order by pu_id,pd_detno
+            <if test="con != null">
+                ${con}
+            </if>
+            <if test="companyId!=null">
+                and verification.companyId=#{companyId}
+            </if>
+            order by vc_id
         </where>
     </select>
+
+    <select id="selectVerificationBycondition"  resultMap="BaseResultMap">
+        select  *  from Verification
+        <where>
+            <if test="con != null">
+                ${con}
+            </if>
+            <if test="companyId != null">
+                and  verification.companyId = #{companyId}
+            </if>
+        </where>
+        order by vc_id
+    </select>
 </mapper>

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

@@ -26,9 +26,9 @@
     <result column="vc_status" property="vc_status" jdbcType="INTEGER" />
     <result column="vc_statuscode" property="vc_statuscode" jdbcType="DECIMAL" />
     <result column="vc_remark" property="vc_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="updateTime" property="updateTime" jdbcType="TIMESTAMP" />
     <result column="vc_text1" property="vc_text1" jdbcType="VARCHAR" />
     <result column="vc_text2" property="vc_text2" jdbcType="VARCHAR" />
     <result column="vc_text3" property="vc_text3" jdbcType="VARCHAR" />
@@ -97,7 +97,7 @@
     vc_id, vc_code, vc_kind, vc_date, vc_vendid, vc_vendcode, vc_vendname, vc_custid, 
     vc_custcode, vc_custname, vc_turnvendid, vc_turnvendcode, vc_turnvendname, vc_turncustid, 
     vc_turncustcode, vc_turncustname, vc_amount1, vc_amount2, vc_recorderid, vc_recorder, 
-    vc_recorddate, vc_status, vc_statuscode, vc_remark, companyid, updaterId, updatedate, 
+    vc_recorddate, vc_status, vc_statuscode, vc_remark, companyId, updaterId, updateTime,
     vc_text1, vc_text2, vc_text3, vc_text4, vc_text5
   </sql>
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.usoftchina.saas.money.po.VerificationExample" >
@@ -139,7 +139,7 @@
       vc_turncustname, vc_amount1, vc_amount2, 
       vc_recorderid, vc_recorder, vc_recorddate, 
       vc_status, vc_statuscode, vc_remark, 
-      companyid, updaterId, updatedate, 
+      companyId, updaterId, updateTime,
       vc_text1, vc_text2, vc_text3, 
       vc_text4, vc_text5)
     values (#{vc_id,jdbcType=INTEGER}, #{vc_code,jdbcType=VARCHAR}, #{vc_kind,jdbcType=VARCHAR}, 
@@ -150,7 +150,7 @@
       #{vc_turncustname,jdbcType=VARCHAR}, #{vc_amount1,jdbcType=DOUBLE}, #{vc_amount2,jdbcType=DOUBLE}, 
       #{vc_recorderid,jdbcType=INTEGER}, #{vc_recorder,jdbcType=VARCHAR}, #{vc_recorddate,jdbcType=TIMESTAMP}, 
       #{vc_status,jdbcType=INTEGER}, #{vc_statuscode,jdbcType=DECIMAL}, #{vc_remark,jdbcType=VARCHAR}, 
-      #{companyid,jdbcType=INTEGER}, #{updaterId,jdbcType=INTEGER}, #{updatedate,jdbcType=TIMESTAMP}, 
+      #{companyId,jdbcType=INTEGER}, #{updaterId,jdbcType=INTEGER}, #{updateTime,jdbcType=TIMESTAMP},
       #{vc_text1,jdbcType=VARCHAR}, #{vc_text2,jdbcType=VARCHAR}, #{vc_text3,jdbcType=VARCHAR}, 
       #{vc_text4,jdbcType=VARCHAR}, #{vc_text5,jdbcType=VARCHAR})
   </insert>
@@ -229,14 +229,14 @@
       <if test="vc_remark != null" >
         vc_remark,
       </if>
-      <if test="companyid != null" >
-        companyid,
+      <if test="companyId != null" >
+        companyId,
       </if>
       <if test="updaterId != null" >
         updaterId,
       </if>
-      <if test="updatedate != null" >
-        updatedate,
+      <if test="updateTime != null" >
+        updateTime,
       </if>
       <if test="vc_text1 != null" >
         vc_text1,
@@ -327,14 +327,14 @@
       <if test="vc_remark != null" >
         #{vc_remark,jdbcType=VARCHAR},
       </if>
-      <if test="companyid != null" >
-        #{companyid,jdbcType=INTEGER},
+      <if test="companyId != null" >
+        #{companyId,jdbcType=INTEGER},
       </if>
       <if test="updaterId != null" >
         #{updaterId,jdbcType=INTEGER},
       </if>
-      <if test="updatedate != null" >
-        #{updatedate,jdbcType=TIMESTAMP},
+      <if test="updateTime != null" >
+        #{updateTime,jdbcType=TIMESTAMP},
       </if>
       <if test="vc_text1 != null" >
         #{vc_text1,jdbcType=VARCHAR},
@@ -434,14 +434,14 @@
       <if test="record.vc_remark != null" >
         vc_remark = #{record.vc_remark,jdbcType=VARCHAR},
       </if>
-      <if test="record.companyid != null" >
-        companyid = #{record.companyid,jdbcType=INTEGER},
+      <if test="record.companyId != null" >
+        companyId = #{record.companyId,jdbcType=INTEGER},
       </if>
       <if test="record.updaterId != null" >
         updaterId = #{record.updaterId,jdbcType=INTEGER},
       </if>
-      <if test="record.updatedate != null" >
-        updatedate = #{record.updatedate,jdbcType=TIMESTAMP},
+      <if test="record.updateTime != null" >
+        updateTime = #{record.updateTime,jdbcType=TIMESTAMP},
       </if>
       <if test="record.vc_text1 != null" >
         vc_text1 = #{record.vc_text1,jdbcType=VARCHAR},
@@ -489,9 +489,9 @@
       vc_status = #{record.vc_status,jdbcType=INTEGER},
       vc_statuscode = #{record.vc_statuscode,jdbcType=DECIMAL},
       vc_remark = #{record.vc_remark,jdbcType=VARCHAR},
-      companyid = #{record.companyid,jdbcType=INTEGER},
+    companyId = #{record.companyId,jdbcType=INTEGER},
       updaterId = #{record.updaterId,jdbcType=INTEGER},
-      updatedate = #{record.updatedate,jdbcType=TIMESTAMP},
+      updateTime = #{record.updateTime,jdbcType=TIMESTAMP},
       vc_text1 = #{record.vc_text1,jdbcType=VARCHAR},
       vc_text2 = #{record.vc_text2,jdbcType=VARCHAR},
       vc_text3 = #{record.vc_text3,jdbcType=VARCHAR},
@@ -573,14 +573,14 @@
       <if test="vc_remark != null" >
         vc_remark = #{vc_remark,jdbcType=VARCHAR},
       </if>
-      <if test="companyid != null" >
-        companyid = #{companyid,jdbcType=INTEGER},
+      <if test="companyId != null" >
+        companyId = #{companyId,jdbcType=INTEGER},
       </if>
       <if test="updaterId != null" >
         updaterId = #{updaterId,jdbcType=INTEGER},
       </if>
-      <if test="updatedate != null" >
-        updatedate = #{updatedate,jdbcType=TIMESTAMP},
+      <if test="updateTime != null" >
+        updateTime = #{updateTime,jdbcType=TIMESTAMP},
       </if>
       <if test="vc_text1 != null" >
         vc_text1 = #{vc_text1,jdbcType=VARCHAR},
@@ -625,9 +625,9 @@
       vc_status = #{vc_status,jdbcType=INTEGER},
       vc_statuscode = #{vc_statuscode,jdbcType=DECIMAL},
       vc_remark = #{vc_remark,jdbcType=VARCHAR},
-      companyid = #{companyid,jdbcType=INTEGER},
+      companyId = #{companyId,jdbcType=INTEGER},
       updaterId = #{updaterId,jdbcType=INTEGER},
-      updatedate = #{updatedate,jdbcType=TIMESTAMP},
+      updateTime = #{updateTime,jdbcType=TIMESTAMP},
       vc_text1 = #{vc_text1,jdbcType=VARCHAR},
       vc_text2 = #{vc_text2,jdbcType=VARCHAR},
       vc_text3 = #{vc_text3,jdbcType=VARCHAR},

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

@@ -13,9 +13,9 @@
     <result column="vd_amount" property="vd_amount" jdbcType="DOUBLE" />
     <result column="vd_nowbalance" property="vd_nowbalance" jdbcType="DOUBLE" />
     <result column="vd_remark" property="vd_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="updateTime" property="updateTime" jdbcType="TIMESTAMP" />
     <result column="vd_text1" property="vd_text1" jdbcType="VARCHAR" />
     <result column="vd_text2" property="vd_text2" jdbcType="VARCHAR" />
     <result column="vd_text3" property="vd_text3" jdbcType="VARCHAR" />
@@ -40,8 +40,8 @@
                 </when>
                 <when test="criterion.listValue" >
                   and ${criterion.condition}
-                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
-                    #{listItem}
+                  <foreach collection="criterion.value" item="listitem" open="(" close=")" separator="," >
+                    #{listitem}
                   </foreach>
                 </when>
               </choose>
@@ -69,8 +69,8 @@
                 </when>
                 <when test="criterion.listValue" >
                   and ${criterion.condition}
-                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
-                    #{listItem}
+                  <foreach collection="criterion.value" item="listitem" open="(" close=")" separator="," >
+                    #{listitem}
                   </foreach>
                 </when>
               </choose>
@@ -82,7 +82,7 @@
   </sql>
   <sql id="Base_Column_List" >
     vd_id, vd_vcid, vd_detno, vd_ym, vd_slid, vd_slcode, vd_slkind, vd_sldate, vd_amount, 
-    vd_nowbalance, vd_remark, companyid, updaterId, updatedate, vd_text1, vd_text2, vd_text3, 
+    vd_nowbalance, vd_remark, companyId, updaterId, updateTime, vd_text1, vd_text2, vd_text3, 
     vd_text4, vd_text5
   </sql>
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.usoftchina.saas.money.po.VerificationdetExample" >
@@ -119,15 +119,15 @@
     insert into verificationdet (vd_id, vd_vcid, vd_detno, 
       vd_ym, vd_slid, vd_slcode, 
       vd_slkind, vd_sldate, vd_amount, 
-      vd_nowbalance, vd_remark, companyid, 
-      updaterId, updatedate, vd_text1, 
+      vd_nowbalance, vd_remark, companyId, 
+      updaterId, updateTime, vd_text1, 
       vd_text2, vd_text3, vd_text4, 
       vd_text5)
     values (#{vd_id,jdbcType=INTEGER}, #{vd_vcid,jdbcType=INTEGER}, #{vd_detno,jdbcType=INTEGER}, 
       #{vd_ym,jdbcType=INTEGER}, #{vd_slid,jdbcType=INTEGER}, #{vd_slcode,jdbcType=VARCHAR}, 
       #{vd_slkind,jdbcType=VARCHAR}, #{vd_sldate,jdbcType=TIMESTAMP}, #{vd_amount,jdbcType=DOUBLE}, 
-      #{vd_nowbalance,jdbcType=DOUBLE}, #{vd_remark,jdbcType=VARCHAR}, #{companyid,jdbcType=INTEGER}, 
-      #{updaterId,jdbcType=INTEGER}, #{updatedate,jdbcType=TIMESTAMP}, #{vd_text1,jdbcType=VARCHAR}, 
+      #{vd_nowbalance,jdbcType=DOUBLE}, #{vd_remark,jdbcType=VARCHAR}, #{companyId,jdbcType=INTEGER}, 
+      #{updaterId,jdbcType=INTEGER}, #{updateTime,jdbcType=TIMESTAMP}, #{vd_text1,jdbcType=VARCHAR}, 
       #{vd_text2,jdbcType=VARCHAR}, #{vd_text3,jdbcType=VARCHAR}, #{vd_text4,jdbcType=VARCHAR}, 
       #{vd_text5,jdbcType=VARCHAR})
   </insert>
@@ -167,14 +167,14 @@
       <if test="vd_remark != null" >
         vd_remark,
       </if>
-      <if test="companyid != null" >
-        companyid,
+      <if test="companyId != null" >
+        companyId,
       </if>
       <if test="updaterId != null" >
         updaterId,
       </if>
-      <if test="updatedate != null" >
-        updatedate,
+      <if test="updateTime != null" >
+        updateTime,
       </if>
       <if test="vd_text1 != null" >
         vd_text1,
@@ -226,14 +226,14 @@
       <if test="vd_remark != null" >
         #{vd_remark,jdbcType=VARCHAR},
       </if>
-      <if test="companyid != null" >
-        #{companyid,jdbcType=INTEGER},
+      <if test="companyId != null" >
+        #{companyId,jdbcType=INTEGER},
       </if>
       <if test="updaterId != null" >
         #{updaterId,jdbcType=INTEGER},
       </if>
-      <if test="updatedate != null" >
-        #{updatedate,jdbcType=TIMESTAMP},
+      <if test="updateTime != null" >
+        #{updateTime,jdbcType=TIMESTAMP},
       </if>
       <if test="vd_text1 != null" >
         #{vd_text1,jdbcType=VARCHAR},
@@ -294,14 +294,14 @@
       <if test="record.vd_remark != null" >
         vd_remark = #{record.vd_remark,jdbcType=VARCHAR},
       </if>
-      <if test="record.companyid != null" >
-        companyid = #{record.companyid,jdbcType=INTEGER},
+      <if test="record.companyId != null" >
+        companyId = #{record.companyId,jdbcType=INTEGER},
       </if>
       <if test="record.updaterId != null" >
         updaterId = #{record.updaterId,jdbcType=INTEGER},
       </if>
-      <if test="record.updatedate != null" >
-        updatedate = #{record.updatedate,jdbcType=TIMESTAMP},
+      <if test="record.updateTime != null" >
+        updateTime = #{record.updateTime,jdbcType=TIMESTAMP},
       </if>
       <if test="record.vd_text1 != null" >
         vd_text1 = #{record.vd_text1,jdbcType=VARCHAR},
@@ -336,9 +336,9 @@
       vd_amount = #{record.vd_amount,jdbcType=DOUBLE},
       vd_nowbalance = #{record.vd_nowbalance,jdbcType=DOUBLE},
       vd_remark = #{record.vd_remark,jdbcType=VARCHAR},
-      companyid = #{record.companyid,jdbcType=INTEGER},
+      companyId = #{record.companyId,jdbcType=INTEGER},
       updaterId = #{record.updaterId,jdbcType=INTEGER},
-      updatedate = #{record.updatedate,jdbcType=TIMESTAMP},
+      updateTime = #{record.updateTime,jdbcType=TIMESTAMP},
       vd_text1 = #{record.vd_text1,jdbcType=VARCHAR},
       vd_text2 = #{record.vd_text2,jdbcType=VARCHAR},
       vd_text3 = #{record.vd_text3,jdbcType=VARCHAR},
@@ -381,14 +381,14 @@
       <if test="vd_remark != null" >
         vd_remark = #{vd_remark,jdbcType=VARCHAR},
       </if>
-      <if test="companyid != null" >
-        companyid = #{companyid,jdbcType=INTEGER},
+      <if test="companyId != null" >
+        companyId = #{companyId,jdbcType=INTEGER},
       </if>
       <if test="updaterId != null" >
         updaterId = #{updaterId,jdbcType=INTEGER},
       </if>
-      <if test="updatedate != null" >
-        updatedate = #{updatedate,jdbcType=TIMESTAMP},
+      <if test="updateTime != null" >
+        updateTime = #{updateTime,jdbcType=TIMESTAMP},
       </if>
       <if test="vd_text1 != null" >
         vd_text1 = #{vd_text1,jdbcType=VARCHAR},
@@ -420,9 +420,9 @@
       vd_amount = #{vd_amount,jdbcType=DOUBLE},
       vd_nowbalance = #{vd_nowbalance,jdbcType=DOUBLE},
       vd_remark = #{vd_remark,jdbcType=VARCHAR},
-      companyid = #{companyid,jdbcType=INTEGER},
+      companyId = #{companyId,jdbcType=INTEGER},
       updaterId = #{updaterId,jdbcType=INTEGER},
-      updatedate = #{updatedate,jdbcType=TIMESTAMP},
+      updateTime = #{updateTime,jdbcType=TIMESTAMP},
       vd_text1 = #{vd_text1,jdbcType=VARCHAR},
       vd_text2 = #{vd_text2,jdbcType=VARCHAR},
       vd_text3 = #{vd_text3,jdbcType=VARCHAR},
@@ -434,48 +434,52 @@
     insert into verificationdet
     (
     vd_id,vd_vcid,vd_detno,vd_ym,vd_slid,vd_slcode,vd_slkind,vd_sldate,
-    vd_amount,vd_nowbalance,vd_remark,companyid,updaterId,updatedate,
+    vd_amount,vd_nowbalance,vd_remark,companyId,updaterId,updateTime,
     vd_text1,vd_text2,vd_text3,vd_text4,vd_text5
     )
     values
-    <foreach collection="list" item="item" index="index" open="" close="" separator=",">
+    <foreach collection="list" item="items1" index="index" open="" close="" separator=",">
       (
-      #{item.vd_id,jdbcType=INTEGER},#{item.vd_vcid,jdbcType=INTEGER},#{item.vd_detno,jdbcType=INTEGER},#{item.vd_ym,jdbcType=INTEGER},#{item.vd_slid,jdbcType=INTEGER},
-      #{item.vd_slcode,jdbcType=VARCHAR},#{item.vd_slkind,jdbcType=VARCHAR},#{item.vd_sldate,jdbcType=DATE},#{item.vd_amount,jdbcType=DOUBLE},
-      #{item.vd_nowbalance,jdbcType=DOUBLE},#{item.vd_remark,jdbcType=VARCHAR},#{item.companyid,jdbcType=INTEGER},#{item.updaterId,jdbcType=INTEGER},#{item.updatedate,jdbcType=DATE},
-      #{item.vd_text1,jdbcType=VARCHAR},#{item.vd_text2,jdbcType=VARCHAR},#{item.vd_text3,jdbcType=VARCHAR},#{item.vd_text4,jdbcType=VARCHAR},
-      #{item.vd_text5,jdbcType=VARCHAR}
+      #{items1.vd_id,jdbcType=INTEGER},#{items1.vd_vcid,jdbcType=INTEGER},#{items1.vd_detno,jdbcType=INTEGER},#{items1.vd_ym,jdbcType=INTEGER},#{items1.vd_slid,jdbcType=INTEGER},
+      #{items1.vd_slcode,jdbcType=VARCHAR},#{items1.vd_slkind,jdbcType=VARCHAR},#{items1.vd_sldate,jdbcType=DATE},#{items1.vd_amount,jdbcType=DOUBLE},
+      #{items1.vd_nowbalance,jdbcType=DOUBLE},#{items1.vd_remark,jdbcType=VARCHAR},#{items1.companyId,jdbcType=INTEGER},#{items1.updaterId,jdbcType=INTEGER},#{items1.updateTime,jdbcType=DATE},
+      #{items1.vd_text1,jdbcType=VARCHAR},#{items1.vd_text2,jdbcType=VARCHAR},#{items1.vd_text3,jdbcType=VARCHAR},#{items1.vd_text4,jdbcType=VARCHAR},
+      #{items1.vd_text5,jdbcType=VARCHAR}
       )
     </foreach>
   </insert>
   <update id="batchUpdate" parameterType="com.usoftchina.saas.money.po.Verificationdet" >
-    <foreach collection="list" item="item" index="index" open="" close="" separator=";">
+    <foreach collection="list" item="items1" index="index" open="" close="" separator=";">
       update Verificationdet <set>
-      vd_id = #{item.vd_id},
-      vd_vcid = #{item.vd_vcid},
-      vd_detno = #{item.vd_detno},
-      vd_ym = #{item.vd_ym},
-      vd_slid = #{item.vd_slid},
-      vd_slcode = #{item.vd_slcode},
-      vd_slkind = #{item.vd_slkind},
-      vd_sldate = #{item.vd_sldate},
-      vd_amount = #{item.vd_amount},
-      vd_nowbalance = #{item.vd_nowbalance},
-      vd_remark = #{item.vd_remark},
-      companyid = #{item.companyid},
-      updaterId = #{item.updaterId},
-      updatedate = #{item.updatedate},
-      vd_text1 = #{item.vd_text1},
-      vd_text2 = #{item.vd_text2},
-      vd_text3= #{item.vd_text3},
-      vd_text4= #{item.vd_text4},
-      vd_text5= #{item.vd_text5}
+      vd_id = #{items1.vd_id},
+      vd_vcid = #{items1.vd_vcid},
+      vd_detno = #{items1.vd_detno},
+      vd_ym = #{items1.vd_ym},
+      vd_slid = #{items1.vd_slid},
+      vd_slcode = #{items1.vd_slcode},
+      vd_slkind = #{items1.vd_slkind},
+      vd_sldate = #{items1.vd_sldate},
+      vd_amount = #{items1.vd_amount},
+      vd_nowbalance = #{items1.vd_nowbalance},
+      vd_remark = #{items1.vd_remark},
+      companyId = #{items1.companyId},
+      updaterId = #{items1.updaterId},
+      updateTime = #{items1.updateTime},
+      vd_text1 = #{items1.vd_text1},
+      vd_text2 = #{items1.vd_text2},
+      vd_text3= #{items1.vd_text3},
+      vd_text4= #{items1.vd_text4},
+      vd_text5= #{items1.vd_text5}
     </set>
-      where vd_vcid = #{item.id,jdbcType=INTEGER}
+      where vd_vcid = #{items1.id,jdbcType=INTEGER}
     </foreach>
   </update>
   <delete id="deleteByParentPrimaryKey" parameterType="java.lang.Long" >
     delete from verificationdet
     where vd_id = #{vd_vcid,jdbcType=INTEGER}
   </delete>
+  <select id="selectByFK" parameterType="long" resultMap="BaseResultMap">
+    select * from verificationdet
+      where vd_vcid=#{vc_id} order by vd_id
+  </select>
 </mapper>

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

@@ -13,9 +13,9 @@
     <result column="vcd_amount" property="vcd_amount" jdbcType="DOUBLE" />
     <result column="vcd_nowbalance" property="vcd_nowbalance" jdbcType="DOUBLE" />
     <result column="vcd_remark" property="vcd_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="updateTime" property="updateTime" jdbcType="TIMESTAMP" />
     <result column="vcd_text1" property="vcd_text1" jdbcType="VARCHAR" />
     <result column="vcd_text2" property="vcd_text2" jdbcType="VARCHAR" />
     <result column="vcd_text3" property="vcd_text3" jdbcType="VARCHAR" />
@@ -81,8 +81,8 @@
     </where>
   </sql>
   <sql id="Base_Column_List" >
-    vcd_id, vcd_vcid, vcd_detno, vcd_ym, vcd_slid, vcd_slcode, vcd_slkind, vcd_sldate, 
-    vcd_amount, vcd_nowbalance, vcd_remark, companyid, updaterId, updatedate, vcd_text1, 
+    vcd_id, vcd_vcid, vcd_detno, vcd_ym, vcd_slid, vcd_slcode, vcd_slkind, vcd_sldate,
+    vcd_amount, vcd_nowbalance, vcd_remark, companyId, updaterId, updateTime, vcd_text1,
     vcd_text2, vcd_text3, vcd_text4, vcd_text5
   </sql>
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.usoftchina.saas.money.po.VerificationdetailExample" >
@@ -100,7 +100,7 @@
     </if>
   </select>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-    select 
+    select
     <include refid="Base_Column_List" />
     from verificationdetail
     where vcd_id = #{vcd_id,jdbcType=INTEGER}
@@ -116,19 +116,19 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.usoftchina.saas.money.po.Verificationdetail" >
-    insert into verificationdetail (vcd_id, vcd_vcid, vcd_detno, 
-      vcd_ym, vcd_slid, vcd_slcode, 
-      vcd_slkind, vcd_sldate, vcd_amount, 
-      vcd_nowbalance, vcd_remark, companyid, 
-      updaterId, updatedate, vcd_text1, 
-      vcd_text2, vcd_text3, vcd_text4, 
+    insert into verificationdetail (vcd_id, vcd_vcid, vcd_detno,
+      vcd_ym, vcd_slid, vcd_slcode,
+      vcd_slkind, vcd_sldate, vcd_amount,
+      vcd_nowbalance, vcd_remark, companyId,
+      updaterId, updateTime, vcd_text1,
+      vcd_text2, vcd_text3, vcd_text4,
       vcd_text5)
-    values (#{vcd_id,jdbcType=INTEGER}, #{vcd_vcid,jdbcType=INTEGER}, #{vcd_detno,jdbcType=INTEGER}, 
-      #{vcd_ym,jdbcType=INTEGER}, #{vcd_slid,jdbcType=INTEGER}, #{vcd_slcode,jdbcType=VARCHAR}, 
-      #{vcd_slkind,jdbcType=VARCHAR}, #{vcd_sldate,jdbcType=TIMESTAMP}, #{vcd_amount,jdbcType=DOUBLE}, 
-      #{vcd_nowbalance,jdbcType=DOUBLE}, #{vcd_remark,jdbcType=VARCHAR}, #{companyid,jdbcType=INTEGER}, 
-      #{updaterId,jdbcType=INTEGER}, #{updatedate,jdbcType=TIMESTAMP}, #{vcd_text1,jdbcType=VARCHAR}, 
-      #{vcd_text2,jdbcType=VARCHAR}, #{vcd_text3,jdbcType=VARCHAR}, #{vcd_text4,jdbcType=VARCHAR}, 
+    values (#{vcd_id,jdbcType=INTEGER}, #{vcd_vcid,jdbcType=INTEGER}, #{vcd_detno,jdbcType=INTEGER},
+      #{vcd_ym,jdbcType=INTEGER}, #{vcd_slid,jdbcType=INTEGER}, #{vcd_slcode,jdbcType=VARCHAR},
+      #{vcd_slkind,jdbcType=VARCHAR}, #{vcd_sldate,jdbcType=TIMESTAMP}, #{vcd_amount,jdbcType=DOUBLE},
+      #{vcd_nowbalance,jdbcType=DOUBLE}, #{vcd_remark,jdbcType=VARCHAR}, #{companyId,jdbcType=INTEGER},
+      #{updaterId,jdbcType=INTEGER}, #{updateTime,jdbcType=TIMESTAMP}, #{vcd_text1,jdbcType=VARCHAR},
+      #{vcd_text2,jdbcType=VARCHAR}, #{vcd_text3,jdbcType=VARCHAR}, #{vcd_text4,jdbcType=VARCHAR},
       #{vcd_text5,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.usoftchina.saas.money.po.Verificationdetail" >
@@ -167,14 +167,14 @@
       <if test="vcd_remark != null" >
         vcd_remark,
       </if>
-      <if test="companyid != null" >
-        companyid,
+      <if test="companyId != null" >
+        companyId,
       </if>
       <if test="updaterId != null" >
         updaterId,
       </if>
-      <if test="updatedate != null" >
-        updatedate,
+      <if test="updateTime != null" >
+        updateTime,
       </if>
       <if test="vcd_text1 != null" >
         vcd_text1,
@@ -226,14 +226,14 @@
       <if test="vcd_remark != null" >
         #{vcd_remark,jdbcType=VARCHAR},
       </if>
-      <if test="companyid != null" >
-        #{companyid,jdbcType=INTEGER},
+      <if test="companyId != null" >
+        #{companyId,jdbcType=INTEGER},
       </if>
       <if test="updaterId != null" >
         #{updaterId,jdbcType=INTEGER},
       </if>
-      <if test="updatedate != null" >
-        #{updatedate,jdbcType=TIMESTAMP},
+      <if test="updateTime != null" >
+        #{updateTime,jdbcType=TIMESTAMP},
       </if>
       <if test="vcd_text1 != null" >
         #{vcd_text1,jdbcType=VARCHAR},
@@ -294,14 +294,14 @@
       <if test="record.vcd_remark != null" >
         vcd_remark = #{record.vcd_remark,jdbcType=VARCHAR},
       </if>
-      <if test="record.companyid != null" >
-        companyid = #{record.companyid,jdbcType=INTEGER},
+      <if test="record.companyId != null" >
+        companyId = #{record.companyId,jdbcType=INTEGER},
       </if>
       <if test="record.updaterId != null" >
         updaterId = #{record.updaterId,jdbcType=INTEGER},
       </if>
-      <if test="record.updatedate != null" >
-        updatedate = #{record.updatedate,jdbcType=TIMESTAMP},
+      <if test="record.updateTime != null" >
+        updateTime = #{record.updateTime,jdbcType=TIMESTAMP},
       </if>
       <if test="record.vcd_text1 != null" >
         vcd_text1 = #{record.vcd_text1,jdbcType=VARCHAR},
@@ -336,9 +336,9 @@
       vcd_amount = #{record.vcd_amount,jdbcType=DOUBLE},
       vcd_nowbalance = #{record.vcd_nowbalance,jdbcType=DOUBLE},
       vcd_remark = #{record.vcd_remark,jdbcType=VARCHAR},
-      companyid = #{record.companyid,jdbcType=INTEGER},
+      companyId = #{record.companyId,jdbcType=INTEGER},
       updaterId = #{record.updaterId,jdbcType=INTEGER},
-      updatedate = #{record.updatedate,jdbcType=TIMESTAMP},
+      updateTime = #{record.updateTime,jdbcType=TIMESTAMP},
       vcd_text1 = #{record.vcd_text1,jdbcType=VARCHAR},
       vcd_text2 = #{record.vcd_text2,jdbcType=VARCHAR},
       vcd_text3 = #{record.vcd_text3,jdbcType=VARCHAR},
@@ -381,14 +381,14 @@
       <if test="vcd_remark != null" >
         vcd_remark = #{vcd_remark,jdbcType=VARCHAR},
       </if>
-      <if test="companyid != null" >
-        companyid = #{companyid,jdbcType=INTEGER},
+      <if test="companyId != null" >
+        companyId = #{companyId,jdbcType=INTEGER},
       </if>
       <if test="updaterId != null" >
         updaterId = #{updaterId,jdbcType=INTEGER},
       </if>
-      <if test="updatedate != null" >
-        updatedate = #{updatedate,jdbcType=TIMESTAMP},
+      <if test="updateTime != null" >
+        updateTime = #{updateTime,jdbcType=TIMESTAMP},
       </if>
       <if test="vcd_text1 != null" >
         vcd_text1 = #{vcd_text1,jdbcType=VARCHAR},
@@ -420,9 +420,9 @@
       vcd_amount = #{vcd_amount,jdbcType=DOUBLE},
       vcd_nowbalance = #{vcd_nowbalance,jdbcType=DOUBLE},
       vcd_remark = #{vcd_remark,jdbcType=VARCHAR},
-      companyid = #{companyid,jdbcType=INTEGER},
+      companyId = #{companyId,jdbcType=INTEGER},
       updaterId = #{updaterId,jdbcType=INTEGER},
-      updatedate = #{updatedate,jdbcType=TIMESTAMP},
+      updateTime = #{updateTime,jdbcType=TIMESTAMP},
       vcd_text1 = #{vcd_text1,jdbcType=VARCHAR},
       vcd_text2 = #{vcd_text2,jdbcType=VARCHAR},
       vcd_text3 = #{vcd_text3,jdbcType=VARCHAR},
@@ -434,48 +434,52 @@
     insert into verificationdetail
     (
     vcd_id,vcd_vcid,vcd_detno,vcd_ym,vcd_slid,vcd_slcode,vcd_slkind,vcd_sldate,
-    vcd_amount,vcd_nowbalance,vcd_remark,companyid,updaterId,updatedate,vcd_text1,
+    vcd_amount,vcd_nowbalance,vcd_remark,companyId,updaterId,updateTime,vcd_text1,
     vcd_text2,vcd_text3,vcd_text4,vcd_text5
     )
     values
-    <foreach collection="list" item="item" index="index" open="" close="" separator=",">
+    <foreach collection="list" item="items2" index="index" open="" close="" separator=",">
       (
-      #{item.vcd_id,jdbcType=INTEGER},#{item.vcd_vcid,jdbcType=INTEGER},#{item.vcd_detno,jdbcType=INTEGER},#{item.vcd_ym,jdbcType=INTEGER},#{item.vcd_slid,jdbcType=INTEGER},
-      #{item.vcd_slcode,jdbcType=VARCHAR},#{item.vcd_slkind,jdbcType=VARCHAR},#{item.vcd_sldate,jdbcType=DATE},#{item.vcd_amount,jdbcType=DOUBLE},
-      #{item.vcd_nowbalance,jdbcType=DOUBLE},#{item.vcd_remark,jdbcType=VARCHAR},#{item.companyid,jdbcType=INTEGER},#{item.updaterId,jdbcType=INTEGER},#{item.updatedate,jdbcType=DATE},
-      #{item.vcd_text1,jdbcType=VARCHAR},#{item.vcd_text2,jdbcType=VARCHAR},#{item.vcd_text3,jdbcType=VARCHAR},#{item.vcd_text4,jdbcType=VARCHAR},
-      #{item.vcd_text5,jdbcType=VARCHAR}
+      #{items2.vcd_id,jdbcType=INTEGER},#{items2.vcd_vcid,jdbcType=INTEGER},#{items2.vcd_detno,jdbcType=INTEGER},#{items2.vcd_ym,jdbcType=INTEGER},#{items2.vcd_slid,jdbcType=INTEGER},
+      #{items2.vcd_slcode,jdbcType=VARCHAR},#{items2.vcd_slkind,jdbcType=VARCHAR},#{items2.vcd_sldate,jdbcType=DATE},#{items2.vcd_amount,jdbcType=DOUBLE},
+      #{items2.vcd_nowbalance,jdbcType=DOUBLE},#{items2.vcd_remark,jdbcType=VARCHAR},#{items2.companyId,jdbcType=INTEGER},#{items2.updaterId,jdbcType=INTEGER},#{items2.updateTime,jdbcType=DATE},
+      #{items2.vcd_text1,jdbcType=VARCHAR},#{items2.vcd_text2,jdbcType=VARCHAR},#{items2.vcd_text3,jdbcType=VARCHAR},#{items2.vcd_text4,jdbcType=VARCHAR},
+      #{items2.vcd_text5,jdbcType=VARCHAR}
       )
     </foreach>
   </insert>
   <update id="batchUpdate" parameterType="com.usoftchina.saas.money.po.Verificationdetail" >
-    <foreach collection="list" item="item" index="index" open="" close="" separator=";">
+    <foreach collection="list" item="items2" index="index" open="" close="" separator=";">
       update verificationdetail <set>
-      vcd_id = #{item.vcd_id},
-      vcd_vcid = #{item.vcd_vcid},
-      vcd_detno = #{item.vcd_detno},
-      vcd_ym = #{item.vcd_ym},
-      vcd_slid = #{item.vcd_slid},
-      vcd_slcode = #{item.vcd_slcode},
-      vcd_slkind = #{item.vcd_slkind},
-      vcd_sldate = #{item.vcd_sldate},
-      vcd_amount = #{item.vcd_amount},
-      vcd_nowbalance = #{item.vcd_nowbalance},
-      vcd_remark = #{item.vcd_remark},
-      companyid = #{item.companyid},
-      updaterId = #{item.updaterId},
-      updatedate = #{item.updatedate},
-      vcd_text1 = #{item.vcd_text1},
-      vcd_text2 = #{item.vcd_text2},
-      vcd_text3= #{item.vcd_text3},
-      vcd_text4= #{item.vcd_text4},
-      vcd_text5= #{item.vcd_text5}
+      vcd_id = #{items2.vcd_id},
+      vcd_vcid = #{items2.vcd_vcid},
+      vcd_detno = #{items2.vcd_detno},
+      vcd_ym = #{items2.vcd_ym},
+      vcd_slid = #{items2.vcd_slid},
+      vcd_slcode = #{items2.vcd_slcode},
+      vcd_slkind = #{items2.vcd_slkind},
+      vcd_sldate = #{items2.vcd_sldate},
+      vcd_amount = #{items2.vcd_amount},
+      vcd_nowbalance = #{items2.vcd_nowbalance},
+      vcd_remark = #{items2.vcd_remark},
+      companyId = #{items2.companyId},
+      updaterId = #{items2.updaterId},
+      updateTime = #{items2.updateTime},
+      vcd_text1 = #{items2.vcd_text1},
+      vcd_text2 = #{items2.vcd_text2},
+      vcd_text3= #{items2.vcd_text3},
+      vcd_text4= #{items2.vcd_text4},
+      vcd_text5= #{items2.vcd_text5}
     </set>
-      where vcd_vcid = #{item.id,jdbcType=INTEGER}
+      where vcd_vcid = #{items2.id,jdbcType=INTEGER}
     </foreach>
   </update>
   <delete id="deleteByParentPrimaryKey" parameterType="java.lang.Long" >
     delete from verificationdetail
     where vd_id = #{vcd_vcid,jdbcType=INTEGER}
   </delete>
+  <select id="selectByFK" parameterType="long" resultMap="BaseResultMap">
+    select * from verificationdetail
+      where vcd_vcid=#{vc_id} order by vcd_id
+  </select>
 </mapper>

applications/purchase/purchase-server/src/main/resources/application.yml

@@ -8,7 +8,7 @@ spring:
       name: admin
       password: select111***
   datasource:
-    driver-class-name: com.mysql.jdbc.Driver
+    driver-class-name: com.mysql.cj.jdbc.Driver
     url: jdbc:mysql://192.168.253.12:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
     username: root
     password: select111***
@@ -47,7 +47,7 @@ eureka:
   client:
     registryFetchIntervalSeconds: 5
     serviceUrl:
-      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.0.181:8500/eureka/
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.0.181:8510/eureka/
 server:
   port: 8800
   tomcat:

applications/storage/storage-server/src/main/resources/application.yml

@@ -47,7 +47,7 @@ eureka:
   client:
     registryFetchIntervalSeconds: 5
     serviceUrl:
-      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.0.181:8500/eureka/
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.0.181:8510/eureka/
 server:
   port: 9000
   tomcat: