修改投融资冗余字段

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

@@ -5,6 +5,7 @@ import cn.hutool.core.map.MapBuilder;
 import com.alibaba.fastjson.JSON;
 import com.yeejoin.amos.boot.module.hygf.api.util.CommonResponseNewUtil;
 import com.yeejoin.amos.boot.module.hygf.api.util.CommonResponseUtil;
+import io.seata.spring.annotation.GlobalTransactional;
 import org.springframework.beans.BeanUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
@@ -47,6 +48,7 @@ public class FinancingInfoController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
+	@GlobalTransactional
 	public ResponseModel<FinancingInfoDto> save(@RequestBody FinancingInfoDto model) {
 	    model = financingInfoServiceImpl.saveModel(model);
 	    return ResponseHelper.buildResponse(model);
@@ -61,6 +63,7 @@ public class FinancingInfoController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PutMapping(value = "/{sequenceNbr}")
 	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
+	@GlobalTransactional
 	public ResponseModel<FinancingInfoDto> updateBySequenceNbrFinancingInfo(@RequestBody FinancingInfoDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
 	    model.setSequenceNbr(sequenceNbr);
 		model.setFile(JSON.toJSONString(model.getFiles()));
@@ -139,6 +142,7 @@ public class FinancingInfoController extends BaseController {
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "GET",value = "撤回",   notes = "撤回")
+	@GlobalTransactional
 	@GetMapping(value = "/rollback")
 	public ResponseModel rollback(String instanceId,String peasantHouseholdId) {
 		 financingInfoServiceImpl.rollback(instanceId,peasantHouseholdId);
@@ -149,6 +153,7 @@ public class FinancingInfoController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "POST",value = "审核",   notes = "审核")
 	@PostMapping(value = "/execueFlow")
+	@GlobalTransactional
 	public ResponseModel execueFlow(@RequestBody Map<String, Object> params) {
 		financingInfoServiceImpl.execueFlow(params);
 		return CommonResponseNewUtil.success();

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

@@ -114,7 +114,6 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
         return this.queryForList("", false);
     }
 
-    @GlobalTransactional
     public FinancingInfoDto saveModel(FinancingInfoDto model) {
         List<String> ids;
         if (model.getPeasantHouseholdIds().contains(",")) {
@@ -160,6 +159,10 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
                 financingAuditingService.createWithModel(financingAuditingDto);
             } else if (financingInfos.getStatus().equals(FinancingAuditEnum.审核不通过.getName()) || financingInfos.getStatus().equals(FinancingAuditEnum.整改待推送.getName()) ){
                 financingInfos.setStatus(FinancingAuditEnum.待融资审核.getName());
+
+                Map<String, Object> orgInfo1 = this.getBaseMapper().selectRZOrgInfo(model.getFinancingCompaniesSeq());
+                financingInfos.setFinancingCompaniesCode(orgInfo1.getOrDefault("ORG_CODE", "").toString());
+                financingInfos.setFinancingCompaniesName(orgInfo1.getOrDefault("COMPANY_NAME", "").toString());
                 this.updateById(financingInfos);
                 Map<String, Object> map = BeanUtil.beanToMap(model);
                 map.put("isFlag","0");
@@ -206,7 +209,6 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
 
 
     @Override
-    @GlobalTransactional
     public void rollback(String processId, String peasantHouseholdId) {
         workFlowService.stopProcess(processId);
         LambdaQueryWrapper<FinancingInfo> queryWrapper = new LambdaQueryWrapper<>();
@@ -231,7 +233,6 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
     }
 
     @Override
-    @GlobalTransactional
     public void execueFlow(Map<String, Object> params) {
         LambdaQueryWrapper<FinancingAuditing> query = new LambdaQueryWrapper<>();
         query.eq(FinancingAuditing::getInstanceId, params.get("instanceId").toString());
@@ -288,6 +289,10 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
         } else {
             financingInfo.setStatus(statusName);
         }
+        Map<String, Object> orgInfo1 = this.getBaseMapper().selectRZOrgInfo(Long.valueOf(params.get("financingCompaniesSeq").toString()));
+        financingInfo.setFinancingCompaniesCode(orgInfo1.getOrDefault("ORG_CODE", "").toString());
+        financingInfo.setFinancingCompaniesName(orgInfo1.getOrDefault("COMPANY_NAME", "").toString());
+
         this.updateById(financingInfo);
 
         //节点为待整改时生成整改单