合并提交还款管理

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/PrivilegeCompany.java

+package com.yeejoin.amos.boot.module.hygf.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName(value = "privilege_company",autoResultMap = true)
+public class PrivilegeCompany extends BaseEntity {
+    @TableField("COMPANY_NAME")
+    private String companyName;
+    @TableField("COMPANY_CODE")
+    private String companyCode;
+    @TableField("DESCRIPTION")
+    private String description;
+    @TableField("PARENT_ID")
+    private Long parentId;
+    @TableField("REGION_SEQ")
+    private String regionSeq;
+    @TableField("`LEVEL`")
+    private String level;
+    @TableField("EMAIL")
+    private String email;
+    @TableField("LONGITUDE")
+    private String longitude;
+    @TableField("LATITUDE")
+    private String latitude;
+    @TableField("CONTACT")
+    private String contact;
+    @TableField("LANDLINE_PHONE")
+    private String landlinePhone;
+    @TableField("ADDRESS")
+    private String address;
+    @TableField("COMPANY_ORG_CODE")
+    private Integer companyOrgCode;
+    @TableField("ORG_CODE")
+    private String orgCode;
+    @TableField("AGENCY_CODE")
+    private String agencyCode;
+    @TableField("COMPANY_TYPE")
+    private String companyType;
+    @TableField("SUPER_ORG_CODE")
+    private String superOrgCode;
+    @TableField(exist = false)
+    private String text;
+
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/RepaymentMapper.java

@@ -3,7 +3,9 @@ package com.yeejoin.amos.boot.module.hygf.api.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.boot.module.hygf.api.config.UserEmpower;
 import com.yeejoin.amos.boot.module.hygf.api.dto.RepaymentDto;
+import com.yeejoin.amos.boot.module.hygf.api.entity.PrivilegeCompany;
 import com.yeejoin.amos.boot.module.hygf.api.entity.Repayment;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -16,4 +18,11 @@ import java.util.List;
 public interface RepaymentMapper extends BaseMapper<Repayment> {
     @UserEmpower(field = {"regional_companies_code"}, dealerField = {"regional_companies_code"}, fieldConditions = {"in"}, relationship = "and")
     List<RepaymentDto> queryPage();
+
+    /**
+     * 获取区域公司通过OrgCode
+     * @param orgCode
+     * @return
+     */
+    PrivilegeCompany getPrivilegeCompanyByOrgCode(@Param("orgCode")String orgCode);
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/RepaymentMapper.xml

@@ -6,4 +6,10 @@
         select * from hygf_repayment
         order by rec_date DESC
     </select>
+
+    <select id="getPrivilegeCompanyByOrgCode"
+            resultType="com.yeejoin.amos.boot.module.hygf.api.entity.PrivilegeCompany">
+        SELECT * FROM privilege_company
+        WHERE ORG_CODE=#{orgCode} LIMIT 1
+    </select>
 </mapper>

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/RepaymentController.java

@@ -58,10 +58,7 @@ public class RepaymentController extends BaseController {
     @PostMapping(value = "/save")
     @ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
     public ResponseModel<RepaymentDto> save(@RequestBody RepaymentDto model) {
-        model.setCronSendState(RepaymentCronSendStateEnum.SEND.getCode());
-        model.setMessageState(RepaymentMessageStateEnum.UN_CONFIRM.getCode());
-        model.setRepayState(RepaymentRepayStateEnum.UN_REPAY.getCode());
-        model = repaymentService.createWithModel(model);
+        model = repaymentService.add(model);
         return ResponseHelper.buildResponse(model);
     }
 
@@ -74,7 +71,7 @@ public class RepaymentController extends BaseController {
     @PutMapping(value = "/updateBySequenceNbr")
     @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
     public ResponseModel<?> updateBySequenceNbr(@RequestBody Repayment model) {
-        repaymentService.updateById(model);
+        repaymentService.updateBySequenceNbr(model);
         return ResponseHelper.buildResponse(null);
     }
 

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/RepaymentServiceImpl.java

@@ -15,6 +15,7 @@ import com.yeejoin.amos.boot.biz.common.utils.ExcelUtils;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.*;
 import com.yeejoin.amos.boot.module.hygf.api.dto.RepaymentDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.WorkflowResultDto;
+import com.yeejoin.amos.boot.module.hygf.api.entity.PrivilegeCompany;
 import com.yeejoin.amos.boot.module.hygf.api.entity.Repayment;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.RepaymentMapper;
 import com.yeejoin.amos.boot.module.hygf.api.service.IRepaymentService;
@@ -239,4 +240,27 @@ public class RepaymentServiceImpl extends BaseService<RepaymentDto, Repayment, R
         }
 
     }
+
+    @Transactional(rollbackFor = Exception.class)
+    public RepaymentDto add(RepaymentDto model) {
+        model.setCronSendState(RepaymentCronSendStateEnum.SEND.getCode());
+        model.setMessageState(RepaymentMessageStateEnum.UN_CONFIRM.getCode());
+        model.setRepayState(RepaymentRepayStateEnum.UN_REPAY.getCode());
+        PrivilegeCompany privilegeCompany = repaymentMapper.getPrivilegeCompanyByOrgCode(model.getRegionalCompaniesCode());
+        if (Objects.nonNull(privilegeCompany)) {
+            model.setCompanyId(privilegeCompany.getSequenceNbr());
+            model.setCompanyName(privilegeCompany.getCompanyName());
+        }
+        return this.createWithModel(model);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public void updateBySequenceNbr(Repayment model) {
+        PrivilegeCompany privilegeCompany = repaymentMapper.getPrivilegeCompanyByOrgCode(model.getRegionalCompaniesCode());
+        if (Objects.nonNull(privilegeCompany)) {
+            model.setCompanyId(privilegeCompany.getSequenceNbr());
+            model.setCompanyName(privilegeCompany.getCompanyName());
+        }
+        this.updateById(model);
+    }
 }