Merge remote-tracking branch 'origin/developer_bw' into developer_bw

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/Enum/FinancingAuditEnum.java

@@ -10,7 +10,7 @@ public enum FinancingAuditEnum {
 
     待融资审核("FinancingAudit","待融资审核","/hygf/drzsh"),
     审核不通过("AuditReject","整改待推送","/hygf/zgdts"),
-    待整改("WaitAbarbeitung","待整改","/hygf/dzg"),
+    待整改("WaitAbarbeitung","重新验收","/hygf/dzg"),
     整改待推送("AbarbeitungWaitPush","审核不通过","/hygf/shym"),
     审核通过("AuditPass","审核通过","/hygf/fkym"),
     放款完成("complete","放款完成","");

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/FinancingInfoDto.java

@@ -8,21 +8,20 @@ import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
 import java.util.Date;
 import java.util.List;
 
 /**
- * 
- *
  * @author system_generator
  * @date 2024-04-01
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value="FinancingInfoDto", description="")
-public class FinancingInfoDto  extends BaseDto {
+@ApiModel(value = "FinancingInfoDto", description = "")
+public class FinancingInfoDto extends BaseDto {
 
-   private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
 
     @ApiModelProperty(value = "所属融资公司id")
@@ -50,12 +49,15 @@ public class FinancingInfoDto  extends BaseDto {
     @ApiModelProperty(value = "状态")
     private String status;
 
-   @ApiModelProperty(value = "农户id")
+    @ApiModelProperty(value = "农户id")
     private String peasantHouseholdIds;
 
-   private String instanceId;
+    private String instanceId;
 
- @ApiModelProperty(value = "附件")
- private List<Object> files;
+    @ApiModelProperty(value = "批次号")
+    private String batchNo;
+
+    @ApiModelProperty(value = "附件")
+    private List<Object> files;
 
 }

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

@@ -57,6 +57,11 @@ public class FinancingInfo extends BaseEntity {
      */
 	@TableField("disbursement_money")
     private Double disbursementMoney;
+    /**
+     * 批次号
+     */
+	@TableField("bacth_no")
+    private String batchNo;
 
     /**
      * 附件

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

@@ -26,4 +26,6 @@ public interface FinancingInfoMapper extends BaseMapper<FinancingInfo> {
 
    Map<String,Object> selectRZOrgInfo(Long id);
 
+   List<Map<String,Object>> selectRegion();
+
 }

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

@@ -35,6 +35,9 @@
             <if test="params.type == 3 ">
                 and info.status in ('待整改','整改未完成')
             </if>
+            <if test="params.region != null and params.region !='' ">
+                and hph.project_address like concat ('%',#{params.region},'%')
+            </if>
         </where>
         ORDER BY
         info.rec_date DESC ,hph.sequence_nbr DESC ) as sta
@@ -71,4 +74,16 @@
         where
             SEQUENCE_NBR=#{id}
     </select>
+
+
+    <select id="selectRegion" resultType="java.util.Map">
+        select
+            REGION_NAME regionName,
+            REGION_CODE regionCode
+        from
+            systemctl_region
+        where
+            PARENT_ID = '0'
+
+    </select>
 </mapper>

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

+package com.yeejoin.amos.boot.module.hygf.biz.controller;
+
+import com.yeejoin.amos.boot.module.hygf.api.dto.CommerceInfoDto;
+import com.yeejoin.amos.boot.module.hygf.biz.service.impl.FinancingInfoServiceImpl;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@Api(tags = "公共接口")
+@RequestMapping(value = "/common")
+public class CommonController {
+
+    @Autowired
+    FinancingInfoServiceImpl financingInfoService;
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/selectRegion")
+    @ApiOperation(httpMethod = "GET", value = "查询全国省份", notes = "查询全国省份")
+    public ResponseModel<List<Map<String,Object>>> selectRegion() {
+        return ResponseHelper.buildResponse(financingInfoService.selectRegion());
+    }
+
+
+
+
+}

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

@@ -54,6 +54,20 @@ public class FinancingInfoController extends BaseController {
 	    return ResponseHelper.buildResponse(model);
 	}
 
+    /**
+     * 新增
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/updateState")
+	@ApiOperation(httpMethod = "PUT", value = "新增", notes = "新增")
+	@Transactional
+	public ResponseModel updateState(@RequestBody List<Long> ids) {
+		financingInfoServiceImpl.updateState(ids);
+	    return ResponseHelper.buildResponse(null);
+	}
+
 	/**
      * 根据sequenceNbr更新
      *
@@ -125,11 +139,12 @@ public class FinancingInfoController extends BaseController {
 	public ResponseModel<Page<Map<String, Object>>> queryForPage(@RequestParam(value = "current") int current,@RequestParam(value = "size") int size,@RequestParam(value = "type") String type,
 																 @RequestParam(value = "status",required = false) String status,
 																 @RequestParam(value = "regionalCompaniesCode" ,required = false) String regionalCompaniesCode ,
+																 @RequestParam(value = "region" ,required = false) String region ,
 																 @RequestParam(value = "ownersName",required = false) String ownersName){
 	    Page<Map<String, Object>> page = new Page<Map<String, Object>>();
 	    page.setCurrent(current);
 	    page.setSize(size);
-	    return ResponseHelper.buildResponse(financingInfoServiceImpl.queryForFinancingInfoPage(page,type,status,regionalCompaniesCode,ownersName));
+	    return ResponseHelper.buildResponse(financingInfoServiceImpl.queryForFinancingInfoPage(page,type,status,regionalCompaniesCode,ownersName, region));
 	}
 
 	/**

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

 package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.map.MapBuilder;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -64,6 +65,10 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
     HouseholdContractMapper householdContractMapper;
     @Autowired
     ConstructionAcceptanceRecordsServiceImpl acceptanceRecordsService;
+    @Autowired
+    FinancingInfoServiceImpl financingInfoService;
+    @Autowired
+    FinancingAuditingServiceImpl financingAuditingService;
 
 
     public Page<AcceptanceCheckDto> selectPage(Long regionCompanyId, Long amosDealerId, int current, int size,
@@ -290,23 +295,6 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
                         up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.DZG.getCode());
                     }
                 }
-               Boolean flag = true;
-                up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.YSROLESDSH.getCode());
-                LambdaQueryWrapper<HygfRectificationOrder> query = new LambdaQueryWrapper<>();
-                query.eq(HygfRectificationOrder::getPeasantHouseholeId,basicGridRecord.getPeasantHouseholdId());
-                query.in(HygfRectificationOrder::getRectificationStatus,Arrays.asList("待整改","待审核"));
-                query.in(HygfRectificationOrder::getRectificationSource,Arrays.asList("ys-fawu","ys-tourong","ys-zichan"));
-                List<HygfRectificationOrder> hygfRectificationOrders = rectificationOrderService.getBaseMapper().selectList(query);
-                for (HygfRectificationOrder hygfRectificationOrder : hygfRectificationOrders) {
-                    if (hygfRectificationOrder.getRectificationStatus().equals("待审核")){
-                        up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.ZGDSH.getCode());
-                        flag = false;
-                        break;
-                    }
-                }
-                if (CollectionUtil.isNotEmpty(hygfRectificationOrders) && flag){
-                    up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.DZG.getCode());
-                }
                 this.wofkflowExcute(instanceId, approvalStatus , comment ,BusinessWorkflowKey.片区运营审核.getCode() );
                 break;
             case "ys-fawu":
@@ -379,7 +367,17 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
                     up.set(AcceptanceCheck::getAcceptanceTime,new Date());
                     up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.YWC.getCode());
                     //验收完成后需对投融数据进行处理。
-
+                    LambdaUpdateWrapper<FinancingInfo> wrapper = new LambdaUpdateWrapper<>();
+                    wrapper.eq(FinancingInfo::getPeasantHouseholdId,basicGridRecord.getPeasantHouseholdId());
+                    wrapper.set(FinancingInfo::getStatus,"待推送");
+                    financingInfoService.update(null,wrapper);
+
+                    LambdaQueryWrapper<FinancingAuditing> finQuery = new LambdaQueryWrapper<>();
+                    finQuery.eq(FinancingAuditing::getPeasantHouseholdId,basicGridRecord.getPeasantHouseholdId());
+                    finQuery.orderByDesc(BaseEntity::getRecDate);
+                    finQuery.last("limit 1");
+                    FinancingAuditing financingAuditing = financingAuditingService.getBaseMapper().selectOne(finQuery);
+                    financingInfoService.execueFlow(MapBuilder.<String,Object>create().put("instanceId",financingAuditing.getInstanceId()).put("approvalStatus","0").put("isZG","1").build());
                 }
                 this.wofkflowExcute(instanceId, approvalStatus , comment  ,BusinessWorkflowKey.资产审核.getCode() );
 

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

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;