融资产品分企业查询，还款登记完成状态修改。融资金额单位转换成万元

sc-service/src/main/java/com/huyi/service/financeProduct/controller/FinanceProductControllers.java

@@ -12,6 +12,8 @@ import com.huyi.service.base.service.IZcFinanceProConRelService;
 import com.huyi.service.base.service.IZcFinanceProductService;
 import com.huyi.service.financeProduct.service.IOwnFinanceProductService;
 import com.keao.tianhu.starter.mybatis.plus.entity.QueryRequest;
+import com.tianhu.common.core.constant.SalaryConstants;
+import com.tianhu.common.core.utils.AmtUtil;
 import com.tianhu.common.core.utils.CommonUtil;
 import com.tianhu.common.core.utils.DateUtils;
 import com.tianhu.common.core.utils.IdUtils;
@@ -21,6 +23,7 @@ import com.tianhu.common.log.annotation.Log;
 import com.tianhu.common.log.enums.BusinessType;
 import com.tianhu.common.security.annotation.PreAuthorize;
 import com.tianhu.common.security.service.TokenService;
+import com.tianhu.system.api.domain.SysUser;
 import com.tianhu.system.api.model.LoginUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
@@ -69,14 +72,14 @@ public class FinanceProductControllers extends BaseController {
     @GetMapping("/list")
     public AjaxResult list(String zfpName, String scyName, String begin,String end, QueryRequest request) {
         //查询当前操作员
-//        LoginUser userInfo = tokenService.getLoginUser();
-//        SysUser use = userInfo.getSysUser();
+        LoginUser userInfo = tokenService.getLoginUser();
+        SysUser use = userInfo.getSysUser();
         //获取企业
-//        String companyId = use.getCompanyId();
+        String companyId = use.getCompanyId();
         Map map = new HashMap(16);
-//        if(!SalaryConstants.OPEX.equals(companyId)){
-//            map.put("companyId",companyId);
-//        }
+        if(!SalaryConstants.OPEX.equals(companyId)){
+            map.put("companyId",companyId);
+        }
         //产品名称
         if(CommonUtil.isNotEmpty(zfpName)){
             map.put("zfpName",zfpName);
@@ -99,6 +102,13 @@ public class FinanceProductControllers extends BaseController {
             map.put("end",CommonUtil.objToBigDecimal(end));
         }
         IPage<Map> list = ownFinanceProductService.selectFinanceProductList(map,request);
+        //转换最小融资金额单位为万元
+        List resList = list.getRecords();
+        for(int i = 0;i<resList.size();i++){
+            Map<String,String> res = (Map<String,String>)resList.get(i);
+            String zfpMinimumAmount = AmtUtil.divide(res.get("zfpMinimumAmount"),"10000");
+            res.put("zfpMinimumAmount",zfpMinimumAmount);
+        }
         return AjaxResult.success(list);
     }
 
@@ -116,6 +126,9 @@ public class FinanceProductControllers extends BaseController {
         //查询用户名称
         Map resultMap = ownFinanceProductService.selectUserName(map);
         ZcFinanceProduct zcFinanceProduct = zcFinanceProductService.getById(zfpId);
+        //转换最小融资金额单位为万元
+        String zfpMinimumAmount = AmtUtil.divide(CommonUtil.objToString(zcFinanceProduct.getZfpMinimumAmount()),"10000");
+        zcFinanceProduct.setZfpMinimumAmount(zfpMinimumAmount);
         resultMap.put("zcFinanceProduct",zcFinanceProduct);
         //查询融资产品关联合同
         LambdaQueryWrapper<ZcFinanceProConRel> queryWrapper = new LambdaQueryWrapper<>();
@@ -181,6 +194,7 @@ public class FinanceProductControllers extends BaseController {
         }
         //最小融资金额
         String zfpMinimumAmount = CommonUtil.objToString(map.get("zfpMinimumAmount"));
+        String minAmount = AmtUtil.multiply(zfpMinimumAmount,"10000");
         if(CommonUtil.isEmpty(zfpMinimumAmount)){
             return AjaxResult.error("最小融资金额不能为空");
         }
@@ -285,7 +299,7 @@ public class FinanceProductControllers extends BaseController {
         zcFinanceProduct.setZfpStatus("01");
         zcFinanceProduct.setZfpManagementId(zfpManagementId);
         zcFinanceProduct.setZfpSplit(zfpSplit);
-        zcFinanceProduct.setZfpMinimumAmount(zfpMinimumAmount);
+        zcFinanceProduct.setZfpMinimumAmount(minAmount);
         zcFinanceProduct.setZfpShortestPeriod(zfpShortestPeriod);
         zcFinanceProduct.setZfpCharge(zfpCharge);
         zcFinanceProduct.setZfpRecourse(zfpRecourse);
@@ -356,6 +370,7 @@ public class FinanceProductControllers extends BaseController {
         String zfpAuthType = CommonUtil.objToString(map.get("zfpAuthType"));
         //最小融资金额
         String zfpMinimumAmount = CommonUtil.objToString(map.get("zfpMinimumAmount"));
+        String minAmount = AmtUtil.multiply(zfpMinimumAmount,"10000");
         if(CommonUtil.isEmpty(zfpMinimumAmount)){
             return AjaxResult.error("最小融资金额不能为空");
         }

sc-service/src/main/java/com/huyi/service/repayment/controller/repaymentController.java

@@ -345,9 +345,9 @@ public class repaymentController extends BaseController {
     public AjaxResult RepaymentRegistration(@RequestBody Map map){
         //附件url
         List<Map<String, String>> file = (List<Map<String, String>>) map.get("zfrApplyFile");
-        if(file.size() == 0){
-            return AjaxResult.error("请上传附件");
-        }
+//        if(file.size() == 0){
+//            return AjaxResult.error("请上传附件");
+//        }
         String zfrApplyFile="";
         String zfrApplyFileId = "";
         if(file.size()>0) {
@@ -368,8 +368,12 @@ public class repaymentController extends BaseController {
         zcFinanceRecord.setZfrId(zfrId);
         //添加上传文件
         zcFinanceRecord.setZfrApplyFile(zfrApplyFileId);
-        //修改融资状态未已结算
+        //修改融资状态为已结算
         zcFinanceRecord.setZfrStatus("03");
+        //修改还款状态为已还款
+        zcFinanceRecord.setZfrApplyFile("01");
+        //更新实际还款日期
+        zcFinanceRecord.setZfrPayDate(DateUtils.getNowDate());
         zcFinanceRecordService.updateZcFinanceRecord(zcFinanceRecord);
         //融信Id
         ZcFinanceRecord record = zcFinanceRecordService.getById(zfrId);

sc-service/src/main/resources/mapper/financeProduct/OwnFinanceProductMapper.xml

@@ -35,9 +35,9 @@
             left join sys_company s
             on z.zfp_management_id = s.scy_id
             where 1=1
-<!--            <if test="paramMap.companyId != null  and paramMap.companyId != ''">-->
-<!--                AND z.zfp_management_id = #{paramMap.companyId}-->
-<!--            </if>-->
+            <if test="paramMap.companyId != null  and paramMap.companyId != ''">
+                AND z.zfp_management_id = #{paramMap.companyId}
+            </if>
             <if test="paramMap.zfpName != null  and paramMap.zfpName != ''">
                 AND z.zfp_name LIKE concat('%', #{paramMap.zfpName}, '%')
             </if>

sc-service/src/main/resources/mapper/repayment/OwnRepaymentMapper.xml

@@ -30,7 +30,7 @@
             left join sys_company y
             on i.zfi_core_id = y.scy_id
             where 1=1
-            AND r.zfr_status = '01'
+            AND r.zfr_status in ('01','03')
             <if test="paramMap.supplierId != null  and paramMap.supplierId != ''">
                 and i.zfi_supplier_id = #{paramMap.supplierId}
             </if>