Browse Source

资金模块-核销单-测试完单据

huangx 7 years ago
parent
commit
671ebd3aaa
15 changed files with 178 additions and 93 deletions
  1. 9 7
      applications/money/money-dto/src/main/java/com/usoftchina/saas/money/dto/VerificationDTO.java
  2. 2 1
      applications/money/money-dto/src/main/java/com/usoftchina/saas/money/dto/VerificationdetDTO.java
  3. 2 1
      applications/money/money-dto/src/main/java/com/usoftchina/saas/money/dto/VerificationdetailDTO.java
  4. 6 0
      applications/money/money-server/pom.xml
  5. 22 0
      applications/money/money-server/src/main/java/com/usoftchina/saas/money/controller/VerificationController.java
  6. 1 1
      applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/VerificationMapper.java
  7. 1 1
      applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/VerificationdetMapper.java
  8. 1 1
      applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/VerificationdetailMapper.java
  9. 6 10
      applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Verification.java
  10. 32 32
      applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/VerificationList.java
  11. 13 0
      applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/VerificationService.java
  12. 61 24
      applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/VerificationServiceImpl.java
  13. 9 2
      applications/money/money-server/src/main/resources/mapper/VerificationListMapper.xml
  14. 12 12
      applications/money/money-server/src/main/resources/mapper/VerificationMapper.xml
  15. 1 1
      applications/money/money-server/src/main/resources/mapper/VerificationdetailMapper.xml

+ 9 - 7
applications/money/money-dto/src/main/java/com/usoftchina/saas/money/dto/VerificationDTO.java

@@ -1,5 +1,6 @@
 package com.usoftchina.saas.money.dto;
 
+import com.usoftchina.saas.base.dto.CommonBaseDTO;
 import com.usoftchina.saas.base.entity.CommonBaseEntity;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
@@ -14,7 +15,7 @@ import java.util.Date;
  */
 @Data
 @ApiModel(value = "Verification", description = "核销单")
-public class VerificationDTO extends CommonBaseEntity implements Serializable {
+public class VerificationDTO implements Serializable {
     private Integer vc_id;
 
     private String vc_code;
@@ -57,9 +58,9 @@ public class VerificationDTO extends CommonBaseEntity implements Serializable {
 
     private Date vc_recorddate;
 
-    private Integer vc_status;
+    private String vc_status;
 
-    private BigDecimal vc_statuscode;
+    private String vc_statuscode;
 
     private String vc_remark;
 
@@ -241,19 +242,19 @@ public class VerificationDTO extends CommonBaseEntity implements Serializable {
         this.vc_recorddate = vc_recorddate;
     }
 
-    public Integer getVc_status() {
+    public String getVc_status() {
         return vc_status;
     }
 
-    public void setVc_status(Integer vc_status) {
+    public void setVc_status(String vc_status) {
         this.vc_status = vc_status;
     }
 
-    public BigDecimal getVc_statuscode() {
+    public String getVc_statuscode() {
         return vc_statuscode;
     }
 
-    public void setVc_statuscode(BigDecimal vc_statuscode) {
+    public void setVc_statuscode(String vc_statuscode) {
         this.vc_statuscode = vc_statuscode;
     }
 
@@ -304,4 +305,5 @@ public class VerificationDTO extends CommonBaseEntity implements Serializable {
     public void setVc_text5(String vc_text5) {
         this.vc_text5 = vc_text5 == null ? null : vc_text5.trim();
     }
+
 }

+ 2 - 1
applications/money/money-dto/src/main/java/com/usoftchina/saas/money/dto/VerificationdetDTO.java

@@ -1,5 +1,6 @@
 package com.usoftchina.saas.money.dto;
 
+import com.usoftchina.saas.base.dto.CommonBaseDTO;
 import com.usoftchina.saas.base.entity.CommonBaseEntity;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
@@ -13,7 +14,7 @@ import java.util.Date;
  */
 @Data
 @ApiModel(value = "Verificationdet", description = "核销单明细一")
-public class VerificationdetDTO extends CommonBaseEntity implements Serializable {
+public class VerificationdetDTO  implements Serializable {
     private Integer vd_id;
 
     private Integer vd_vcid;

+ 2 - 1
applications/money/money-dto/src/main/java/com/usoftchina/saas/money/dto/VerificationdetailDTO.java

@@ -1,5 +1,6 @@
 package com.usoftchina.saas.money.dto;
 
+import com.usoftchina.saas.base.dto.CommonBaseDTO;
 import com.usoftchina.saas.base.entity.CommonBaseEntity;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
@@ -13,7 +14,7 @@ import java.util.Date;
  */
 @Data
 @ApiModel(value = "Verificationdetail", description = "核销单明细二")
-public class VerificationdetailDTO extends CommonBaseEntity implements Serializable {
+public class VerificationdetailDTO implements Serializable {
     private Integer vcd_id;
 
     private Integer vcd_vcid;

+ 6 - 0
applications/money/money-server/pom.xml

@@ -91,6 +91,12 @@
             <groupId>com.usoftchina.saas</groupId>
             <artifactId>commons-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.usoftchina.saas</groupId>
+            <artifactId>commons-server</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

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

@@ -73,6 +73,28 @@ public class VerificationController {
         return Result.success();
     }
 
+    /**
+     * 核销单明细1删除
+     * @param id
+     * @return
+     */
+    @RequestMapping("/deleteDetail1/{id}")
+    public Result deleteDetail1(@PathVariable("id") Long id) {
+        verificationService.deleteDetail1(id);
+        return Result.success();
+    }
+
+    /**
+     * 核销单明细2删除
+     * @param id
+     * @return
+     */
+    @RequestMapping("/deleteDetail2/{id}")
+    public Result deleteDetail2(@PathVariable("id") Long id) {
+        verificationService.deleteDetail2(id);
+        return Result.success();
+    }
+
     @RequestMapping("/audit")
     public Result audit(@RequestBody VerificationFormDTO formDTO) {
         DocSavedDTO audit = verificationService.audit(formDTO);

+ 1 - 1
applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/VerificationMapper.java

@@ -17,7 +17,7 @@ public interface VerificationMapper extends CommonBaseMapper<Verification> {
 
     int deleteByPrimaryKey(Integer vc_id);
 
-    Long insert(Verification record);
+//    Long insert(Verification record);
 
     int insertSelective(Verification record);
 

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

@@ -17,7 +17,7 @@ public interface VerificationdetMapper extends CommonBaseMapper<Verificationdet>
 
     int deleteByPrimaryKey(Integer vd_id);
 
-    Long insert(Verificationdet record);
+//    Long insert(Verificationdet record);
 
     int insertSelective(Verificationdet record);
 

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

@@ -18,7 +18,7 @@ public interface VerificationdetailMapper extends CommonBaseMapper<Verificationd
 
     int deleteByPrimaryKey(Integer vcd_id);
 
-    Long insert(Verificationdetail record);
+//    Long insert(Verificationdetail record);
 
     int insertSelective(Verificationdetail record);
 

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

@@ -55,9 +55,9 @@ public class Verification extends CommonBaseEntity implements Serializable {
 
     private Date vc_recorddate;
 
-    private Integer vc_status;
+    private String vc_status;
 
-    private BigDecimal vc_statuscode;
+    private String vc_statuscode;
 
     private String vc_remark;
 
@@ -239,19 +239,19 @@ public class Verification extends CommonBaseEntity implements Serializable {
         this.vc_recorddate = vc_recorddate;
     }
 
-    public Integer getVc_status() {
+    public String getVc_status() {
         return vc_status;
     }
 
-    public void setVc_status(Integer vc_status) {
+    public void setVc_status(String vc_status) {
         this.vc_status = vc_status;
     }
 
-    public BigDecimal getVc_statuscode() {
+    public String getVc_statuscode() {
         return vc_statuscode;
     }
 
-    public void setVc_statuscode(BigDecimal vc_statuscode) {
+    public void setVc_statuscode(String vc_statuscode) {
         this.vc_statuscode = vc_statuscode;
     }
 
@@ -313,10 +313,6 @@ public class Verification extends CommonBaseEntity implements Serializable {
 
     }
 
-    @Override
-    public long getCompanyId() {
-        return 0;
-    }
 
     @Override
     public void setCompanyId(long companyId) {

+ 32 - 32
applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/VerificationList.java

@@ -102,37 +102,37 @@ public class VerificationList extends CommonBaseEntity implements Serializable {
     private String vd_text4;
 
     private String vd_text5;
-
-    private Integer vcd_id;
-
-    private Integer vcd_vcid;
-
-    private Integer vcd_detno;
-
-    private Integer vcd_ym;
-
-    private Integer vcd_slid;
-
-    private String vcd_slcode;
-
-    private String vcd_slkind;
-
-    private Date vcd_sldate;
-
-    private Double vcd_amount;
-
-    private Double vcd_nowbalance;
-
-    private String vcd_remark;
-
-    private String vcd_text1;
-
-    private String vcd_text2;
-
-    private String vcd_text3;
-
-    private String vcd_text4;
-
-    private String vcd_text5;
+//
+//    private Integer vcd_id;
+//
+//    private Integer vcd_vcid;
+//
+//    private Integer vcd_detno;
+//
+//    private Integer vcd_ym;
+//
+//    private Integer vcd_slid;
+//
+//    private String vcd_slcode;
+//
+//    private String vcd_slkind;
+//
+//    private Date vcd_sldate;
+//
+//    private Double vcd_amount;
+//
+//    private Double vcd_nowbalance;
+//
+//    private String vcd_remark;
+//
+//    private String vcd_text1;
+//
+//    private String vcd_text2;
+//
+//    private String vcd_text3;
+//
+//    private String vcd_text4;
+//
+//    private String vcd_text5;
 
 }

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

@@ -8,6 +8,7 @@ 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;
+import io.swagger.models.auth.In;
 
 /**
  * @author hx
@@ -43,6 +44,18 @@ public interface VerificationService {
      */
     void delete(Long id);
 
+    /**
+     * 删除核销单明细1
+     * @param id
+     */
+    void deleteDetail1(Long id);
+
+    /**
+     * 删除核销单明细2
+     * @param id
+     */
+    void deleteDetail2(Long id);
+
     /**
      * 审核核销单
      * @param formData

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

@@ -9,7 +9,9 @@ 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.BillCodeSeq;
 import com.usoftchina.saas.commons.po.Operation;
+import com.usoftchina.saas.commons.po.Status;
 import com.usoftchina.saas.context.BaseContextHolder;
 import com.usoftchina.saas.exception.BizException;
 import com.usoftchina.saas.money.dto.*;
@@ -31,8 +33,8 @@ import java.util.List;
 
 @Service
 public class VerificationServiceImpl extends CommonBaseServiceImpl<VerificationMapper,Verification> implements VerificationService {
-//    @Autowired
-//    private MaxnumberService maxnumberService;
+    @Autowired
+    private MaxnumberService maxnumberService;
     @Autowired
     private VerificationMapper verificationMapper;
     @Autowired
@@ -41,8 +43,8 @@ public class VerificationServiceImpl extends CommonBaseServiceImpl<VerificationM
     private VerificationdetailMapper verificationdetailMapper;
     @Autowired
     private VerificationListMapper verificationListMapper;
-//    @Autowired
- //   private MessageLogService messageLogService;
+    @Autowired
+    private MessageLogService messageLogService;
 
 
     @Override
@@ -117,15 +119,15 @@ public class VerificationServiceImpl extends CommonBaseServiceImpl<VerificationM
         List<Verificationdet> updateDetails1 = new ArrayList<>();
         List<Verificationdetail> updateDetails2 = new ArrayList<>();
         DocSavedDTO saveDTO = new DocSavedDTO();
-        Long id = main.getId();
+        Long id = Long.valueOf(String.valueOf(main.getVc_id()));
         String code = main.getVc_code();
         Verification verification = BeanMapper.map(main,Verification.class);
         verification.setCompanyId(companyId);
         verification.setCreatorId(userId);
         verification.setCreateTime(new Date());
         //编号获取
-//        code = pushMaxnubmer(code,id);
-        code = "1";
+        code = pushMaxnubmer(code,id);
+//        code = "1";
         verification.setVc_code(code);
         saveDTO.setCode(code);
         //判断更新与保存动作
@@ -137,11 +139,13 @@ public class VerificationServiceImpl extends CommonBaseServiceImpl<VerificationM
             for (VerificationdetDTO item : items1) {
                 Verificationdet detail = BeanMapper.map(item,Verificationdet.class);
                 detail.setVd_vcid(id);
+                detail.setCompanyId(companyId);
                 insertDetails1.add(detail);
             }
             for (VerificationdetailDTO item : items2) {
                 Verificationdetail detail = BeanMapper.map(item,Verificationdetail.class);
                 detail.setVcd_vcid(id);
+                detail.setCompanyId(companyId);
                 insertDetails2.add(detail);
             }
             //插入从表
@@ -160,6 +164,7 @@ public class VerificationServiceImpl extends CommonBaseServiceImpl<VerificationM
         for (VerificationdetDTO item : items1) {
             Verificationdet detail = BeanMapper.map(item, Verificationdet.class);
             detail.setVd_vcid(id);
+            detail.setCompanyId(companyId);
             if (StringUtils.isEmpty(detail.getId()) || "0".equals(detail.getId().toString())) {
                 insertDetails1.add(detail);
             } else {
@@ -169,6 +174,7 @@ public class VerificationServiceImpl extends CommonBaseServiceImpl<VerificationM
         for (VerificationdetailDTO item : items2) {
             Verificationdetail detail = BeanMapper.map(item, Verificationdetail.class);
             detail.setVcd_vcid(id);
+            detail.setCompanyId(companyId);
             if (StringUtils.isEmpty(detail.getId()) || "0".equals(detail.getId().toString())) {
                 insertDetails2.add(detail);
             } else {
@@ -206,9 +212,39 @@ public class VerificationServiceImpl extends CommonBaseServiceImpl<VerificationM
             DocBaseDTO baseDTO = new DocBaseDTO();
             baseDTO.setId(id);
             baseDTO.setCode(code);
-            baseDTO.setName("Verification");
+            baseDTO.setName(BillCodeSeq.VERIFICATION.getName());
             //日志
-//            messageLogService.delete(baseDTO);
+            messageLogService.delete(baseDTO);
+        }
+    }
+
+    @Override
+    public void deleteDetail1(Long id) {
+        if (null != id) {
+            verificationdetMapper.deleteByParentPrimaryKey(Long.valueOf(String.valueOf(id)));
+            Verificationdet verificationdet = verificationdetMapper.selectByPrimaryKey(Integer.valueOf(String.valueOf(id)));
+            Verification verification = verificationMapper.selectByPrimaryKey(verificationdet.getVd_vcid());
+            DocBaseDTO baseDTO = new DocBaseDTO();
+            baseDTO.setId(id);
+            baseDTO.setCode(verification.getVc_code());
+            baseDTO.setName(BillCodeSeq.VERIFICATION.getName());
+            //日志
+            messageLogService.deleteDetail(baseDTO);
+        }
+    }
+
+    @Override
+    public void deleteDetail2(Long id) {
+        if (null != id) {
+            verificationdetailMapper.deleteByParentPrimaryKey(id);
+            Verificationdetail verificationdetail = verificationdetailMapper.selectByPrimaryKey(Integer.valueOf(String.valueOf(id)));
+            Verification verification = verificationMapper.selectByPrimaryKey(verificationdetail.getVcd_vcid());
+            DocBaseDTO baseDTO = new DocBaseDTO();
+            baseDTO.setId(id);
+            baseDTO.setCode(verification.getVc_code());
+            baseDTO.setName(BillCodeSeq.VERIFICATION.getName());
+            //日志
+            messageLogService.deleteDetail(baseDTO);
         }
     }
 
@@ -217,14 +253,15 @@ public class VerificationServiceImpl extends CommonBaseServiceImpl<VerificationM
         Long id = null;
         DocSavedDTO savedDTO = new DocSavedDTO();
         if (null != formData) {
-            id = formData.getMain().getId();
+            id = Long.valueOf(String.valueOf(formData.getMain().getVc_id()));
             if (StringUtils.isEmpty(id)) {
                 DocSavedDTO saveDTO = saveFormData(formData);
                 id = saveDTO.getId();
             }
             Verification verification = new Verification();
-           // verification.setVc_status(Operation.AUDIT.getTitle());
-           // verification.setVc_statuscode(Status.AUDITED.name());
+            verification.setVc_status(Status.AUDITED.getDisplay());
+            verification.setVc_statuscode(Status.AUDITED.name());
+            verification.setVc_id(Integer.valueOf(String.valueOf(id)));
             verificationMapper.updateByPrimaryKeySelective(verification);
         }
         savedDTO.setId(id);
@@ -242,9 +279,9 @@ public class VerificationServiceImpl extends CommonBaseServiceImpl<VerificationM
         }
         Verification verification = new Verification();
         //生成更新对象
-        verification.setId(id);
-//        verification.setVc_status();
-//        verification.setVc_statuscode();
+        verification.setVc_id(Integer.valueOf(String.valueOf(id)));
+        verification.setVc_status(Status.UNAUDITED.getDisplay());
+        verification.setVc_statuscode(Status.UNAUDITED.name());
         verification.setUpdateTime(new Date());
         verification.setUpdaterId(BaseContextHolder.getUserId());
         //更新存在字段
@@ -254,15 +291,15 @@ public class VerificationServiceImpl extends CommonBaseServiceImpl<VerificationM
         baseDTO.setCode(code);
         baseDTO.setName("Verification");
         //日志
-//        messageLogService.unAudit(baseDTO);
+        messageLogService.unAudit(baseDTO);
     }
 
-//    private String pushMaxnubmer(String code, Long id) {
-//        if (null == code) {
-//            throw new BizException(BizExceptionCode.NULL_CODE);
-//        }
-//        Integer count = "0".equals(String.valueOf(id)) ? verificationMapper.validateCodeWhenInsert(code) :
-//                verificationMapper.validateCodeWhenUpdate(code, id);
-//        return maxnumberService.pushMaxnubmer(count, code, "Verification");
-//    }
+    private String pushMaxnubmer(String code, Long id) {
+        if (null == code) {
+            throw new BizException(BizExceptionCode.NULL_CODE);
+        }
+        Integer count = "0".equals(String.valueOf(id)) ? verificationMapper.validateCodeWhenInsert(code) :
+                verificationMapper.validateCodeWhenUpdate(code, id);
+        return maxnumberService.pushMaxnubmer(count, code, BillCodeSeq.VERIFICATION.getCaller()).getData();
+    }
 }

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

@@ -45,8 +45,13 @@
         <result column="vd_remark" property="vd_remark" jdbcType="VARCHAR" />
 
     </resultMap>
+    <sql id="Base_Column_List">
+    vc_id, vc_code, vc_kind, vc_date, vc_vendid, vc_vendcode
+  </sql>
     <select id="selectVerificationListByCondition"  resultMap="BaseResultMap">
-        select  *  from verification left join verificationdet on vc_id=vd_vcid left join verificationdetail on vc_id=vcd_vcid
+        select
+        <include refid="Base_Column_List" />
+        from verification left join verificationdet on vc_id=vd_vcid
         <where>
             <if test="con != null">
                 ${con}
@@ -59,7 +64,9 @@
     </select>
 
     <select id="selectVerificationBycondition"  resultMap="BaseResultMap">
-        select  *  from Verification
+        select
+        <include refid="Base_Column_List" />
+        from Verification
         <where>
             <if test="con != null">
                 ${con}

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

@@ -120,7 +120,7 @@
     from verification
     where vc_id = #{vc_id,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long" >
     delete from verification
     where vc_id = #{vc_id,jdbcType=INTEGER}
   </delete>
@@ -149,7 +149,7 @@
       #{vc_turnvendname,jdbcType=VARCHAR}, #{vc_turncustid,jdbcType=INTEGER}, #{vc_turncustcode,jdbcType=VARCHAR}, 
       #{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}, 
+      #{vc_status,jdbcType=VARCHAR}, #{vc_statuscode,jdbcType=VARCHAR}, #{vc_remark,jdbcType=VARCHAR},
       #{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})
@@ -319,10 +319,10 @@
         #{vc_recorddate,jdbcType=TIMESTAMP},
       </if>
       <if test="vc_status != null" >
-        #{vc_status,jdbcType=INTEGER},
+        #{vc_status,jdbcType=VARCHAR},
       </if>
       <if test="vc_statuscode != null" >
-        #{vc_statuscode,jdbcType=DECIMAL},
+        #{vc_statuscode,jdbcType=VARCHAR},
       </if>
       <if test="vc_remark != null" >
         #{vc_remark,jdbcType=VARCHAR},
@@ -426,10 +426,10 @@
         vc_recorddate = #{record.vc_recorddate,jdbcType=TIMESTAMP},
       </if>
       <if test="record.vc_status != null" >
-        vc_status = #{record.vc_status,jdbcType=INTEGER},
+        vc_status = #{record.vc_status,jdbcType=VARCHAR},
       </if>
       <if test="record.vc_statuscode != null" >
-        vc_statuscode = #{record.vc_statuscode,jdbcType=DECIMAL},
+        vc_statuscode = #{record.vc_statuscode,jdbcType=VARCHAR},
       </if>
       <if test="record.vc_remark != null" >
         vc_remark = #{record.vc_remark,jdbcType=VARCHAR},
@@ -486,8 +486,8 @@
       vc_recorderid = #{record.vc_recorderid,jdbcType=INTEGER},
       vc_recorder = #{record.vc_recorder,jdbcType=VARCHAR},
       vc_recorddate = #{record.vc_recorddate,jdbcType=TIMESTAMP},
-      vc_status = #{record.vc_status,jdbcType=INTEGER},
-      vc_statuscode = #{record.vc_statuscode,jdbcType=DECIMAL},
+      vc_status = #{record.vc_status,jdbcType=VARCHAR},
+      vc_statuscode = #{record.vc_statuscode,jdbcType=VARCHAR},
       vc_remark = #{record.vc_remark,jdbcType=VARCHAR},
     companyId = #{record.companyId,jdbcType=INTEGER},
       updaterId = #{record.updaterId,jdbcType=INTEGER},
@@ -565,10 +565,10 @@
         vc_recorddate = #{vc_recorddate,jdbcType=TIMESTAMP},
       </if>
       <if test="vc_status != null" >
-        vc_status = #{vc_status,jdbcType=INTEGER},
+        vc_status = #{vc_status,jdbcType=VARCHAR},
       </if>
       <if test="vc_statuscode != null" >
-        vc_statuscode = #{vc_statuscode,jdbcType=DECIMAL},
+        vc_statuscode = #{vc_statuscode,jdbcType=VARCHAR},
       </if>
       <if test="vc_remark != null" >
         vc_remark = #{vc_remark,jdbcType=VARCHAR},
@@ -622,8 +622,8 @@
       vc_recorderid = #{vc_recorderid,jdbcType=INTEGER},
       vc_recorder = #{vc_recorder,jdbcType=VARCHAR},
       vc_recorddate = #{vc_recorddate,jdbcType=TIMESTAMP},
-      vc_status = #{vc_status,jdbcType=INTEGER},
-      vc_statuscode = #{vc_statuscode,jdbcType=DECIMAL},
+      vc_status = #{vc_status,jdbcType=VARCHAR},
+      vc_statuscode = #{vc_statuscode,jdbcType=VARCHAR},
       vc_remark = #{vc_remark,jdbcType=VARCHAR},
       companyId = #{companyId,jdbcType=INTEGER},
       updaterId = #{updaterId,jdbcType=INTEGER},

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

@@ -476,7 +476,7 @@
   </update>
   <delete id="deleteByParentPrimaryKey" parameterType="java.lang.Long" >
     delete from verificationdetail
-    where vd_id = #{vcd_vcid,jdbcType=INTEGER}
+    where vcd_id = #{vcd_vcid,jdbcType=INTEGER}
   </delete>
   <select id="selectByFK" parameterType="long" resultMap="BaseResultMap">
     select * from verificationdetail