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

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

@@ -31,7 +31,7 @@ LEFT JOIN  hygf_document_station on hygf_document_station.station_id=hygf_peasan
                 and hygf_preparation_money.amos_unit_id = #{dto.amosUnitId}
             </if>
             <if test="dto.flag != null and dto.flag != ''">
-                and hygf_preparation_money.delivery_state != "已作废"
+                and hygf_preparation_money.delivery_state != "已作废" and hygf_preparation_money.delivery_state != "待发货"
             </if>
             <if test="dto.deliveryTimeStart != null and dto.deliveryTimeEnd != ''">
                 and hygf_preparation_money.delivery_time between #{dto.deliveryTimeStart} and #{dto.deliveryTimeEnd}

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

@@ -66,7 +66,9 @@ from  privilege_company  where IS_DELETED=0 and AGENCY_CODE='JXIOP'
     <select id="getuserListByOrgCode" resultType="Map">
 
         select
-        DISTINCT std_user_biz.real_name realName
+        <!-- 2024/07/05 沟通后不用去重 -->
+        <!-- DISTINCT std_user_biz.real_name realName-->
+            std_user_biz.real_name realName
         from
         std_user_biz LEFT JOIN hygf_personnel_business on std_user_biz.sequence_nbr =hygf_personnel_business.foundation_id
 

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

@@ -19,6 +19,7 @@ import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -47,6 +48,7 @@ import java.util.stream.Collectors;
 @RestController
 @Api(tags = "Api")
 @RequestMapping(value = "/household-contract")
+@Slf4j
 public class HouseholdContractController extends BaseController {
     private static final Logger logger = LoggerFactory.getLogger(HouseholdContractController.class);
     @Autowired
@@ -319,6 +321,7 @@ public class HouseholdContractController extends BaseController {
        try {
            householdContract = householdContractServiceImpl.reissueinitiateHouseholdContract(model);
        }catch (Exception e){
+           log.error("重新发起合同错误, 入参: {}, error:", JSON.toJSONString(model), e);
            throw new BadRequest(e.getMessage());
        }
         return ResponseHelper.buildResponse(householdContract);

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

 package com.yeejoin.amos.boot.module.hygf.biz.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.yeejoin.amos.boot.module.hygf.api.config.UserLimits;
 import com.yeejoin.amos.boot.module.hygf.api.dto.DropDown;
 import com.yeejoin.amos.boot.module.hygf.api.entity.Maintenance;
@@ -9,6 +10,7 @@ import com.yeejoin.amos.boot.module.hygf.api.mapper.JpStationMapper;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.MaintenanceMapper;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.Privilege;
+import lombok.extern.slf4j.Slf4j;
 import net.sf.json.JSONObject;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
@@ -22,6 +24,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.MaintenanceServiceImpl;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,6 +46,7 @@ import org.typroject.tyboot.core.foundation.enumeration.UserType;
 @RestController
 @Api(tags = "运维人员Api")
 @RequestMapping(value = "/maintenance")
+@Slf4j
 public class MaintenanceController extends BaseController {
 
     @Autowired
@@ -62,7 +66,12 @@ public class MaintenanceController extends BaseController {
     @PostMapping(value = "/save")
     @ApiOperation(httpMethod = "POST", value = "新增运维人员", notes = "新增运维人员")
     public ResponseModel<Maintenance> save(@RequestBody Maintenance model) {
-        model = maintenanceServiceImpl.saveMaintenance(model);
+        try {
+            model = maintenanceServiceImpl.saveMaintenance(model);
+        } catch (Exception e) {
+            log.error("农户注册错误, 入参: {}, error:", JSON.toJSONString(model), e);
+            throw new BadRequest(e.getMessage());
+        }
         return ResponseHelper.buildResponse(model);
     }
 

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

@@ -30,6 +30,7 @@ import com.yeejoin.amos.boot.module.hygf.biz.service.impl.QiyuesuoServiceImpl;
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.ToDoTasksServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -59,6 +60,7 @@ import java.util.Map;
 @RestController
 @Api(tags = "契税锁Api")
 @RequestMapping(value = "/qiyuesuo")
+@Slf4j
 public class QiyuesuoController extends BaseController {
 	private static final Logger logger = LoggerFactory.getLogger(QiyuesuoController.class);
 
@@ -139,6 +141,7 @@ public class QiyuesuoController extends BaseController {
 		try {
 			householdContract = householdContractServiceImpl.initiateHouseholdContract(model);
 		} catch (Exception e) {
+			log.error("创建合同错误, 入参: {}, error:", JSON.toJSONString(model), e);
 			throw new BadRequest(e.getMessage());
 		}
 		return ResponseHelper.buildResponse(householdContract);

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

@@ -281,7 +281,7 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
         if (null == financingAuditingDto.getInstanceId()) {
             financingAuditingDto.setInstanceId(financingAuditing.getInstanceId());
         }
-        financingAuditingDto.setStatus(params.getOrDefault("comments", "").toString());
+        financingAuditingDto.setStatus(params.get("approvalStatus").toString());
         financingAuditingDto.setNodeRouting(FinancingAuditEnum.getNodeByCode(workflowResultDto.getNextNodeKey()));
         financingAuditingService.createWithModel(financingAuditingDto);
 

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

@@ -818,7 +818,7 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
 
             return true;
         } catch (Exception e) {
-            throw new BadRequest("删除失败！");
+            throw new BadRequest("删除失败！" + e.getMessage());
         }
     }