Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/ContractManagementInfoController.java

@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
 
 /**
  * <p>
@@ -34,8 +35,8 @@ public class ContractManagementInfoController {
     /**
      * 新增合同信息
      */
-    @PostMapping("/addInfo")
-    public String addInfo(@RequestBody ContractManagementInfo contractManagementInfo) {
+    @PostMapping("/api/addInfo")
+    public String addInfo(@RequestBody @Valid ContractManagementInfo contractManagementInfo) {
         return contractManagementInfoService.addInfo(contractManagementInfo);
     }
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/ContractManagementInfo.java

@@ -108,11 +108,13 @@ public class ContractManagementInfo extends BaseModel<ContractManagementInfo> {
     /**
      * 交货日期（起）
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date deliveryDateStart;
     /**
      * 交货日期（止）
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date deliveryDateEnd;
     /**
@@ -126,6 +128,7 @@ public class ContractManagementInfo extends BaseModel<ContractManagementInfo> {
     /**
      * 签订日期
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date signingDate;
     /**

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/ContractManagementInfoServiceImpl.java

@@ -71,9 +71,11 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
         // 货物信息新增
         ContractGoodsInfo contractGoodsInfo = contractManagementInfo.getContractGoodsInfo();
         contractGoodsInfo.setId(IdGenerator.generateUUID());
+        contractGoodsInfo.setContractId(contractManagementInfo.getId());
         //流程新增
         ContractProcessInfo contractProcessInfo = contractManagementInfo.getContractProcessInfo();
         contractProcessInfo.setId(IdGenerator.generateUUID());
+        contractProcessInfo.setContractId(contractManagementInfo.getId());
         boolean one = this.insert(contractManagementInfo);
         boolean two = contractGoodsInfoService.insert(contractGoodsInfo);
         boolean three = contractProcessInfoService.insert(contractProcessInfo);

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/ContractManagementInfoMapper.xml

@@ -12,7 +12,7 @@
         m.comp_id = #{compId}
         <if test="searchType != null and searchType != ''">
             <if test="searchType == 1">
-                AND m.status_flag == '1' or m.status_flag == '0'
+                AND m.status_flag != '3'
             </if>
             <if test="searchType == 2">
                 AND m.status_flag == '3'
@@ -61,7 +61,7 @@
         m.comp_id = #{compId}
         <if test="searchType != null and searchType != ''">
             <if test="searchType == 1">
-                AND m.status_flag == '1'
+                AND m.status_flag != '3'
             </if>
             <if test="searchType == 2">
                 AND m.status_flag == '3'