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

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

 package com.yeejoin.amos.boot.module.hygf.api.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
@@ -29,6 +31,6 @@ public class HygfReplenishmentDto  extends BaseDto {
     private String comment;
 
     @ApiModelProperty(value = "补货文件")
-    private List<Object> file;
+    private String file;
 
 }

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

@@ -41,6 +41,6 @@ public class HygfReplenishment extends BaseEntity {
      * 补货文件
      */
 	@TableField(value = "file" , typeHandler = FastjsonTypeHandler.class)
-    private String file;
+    private List<Object> file;
 
 }

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

 package com.yeejoin.amos.boot.module.hygf.api.mapper;
 
+import com.yeejoin.amos.boot.module.hygf.api.dto.HygfReplenishmentDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.HygfReplenishment;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.util.List;
+
 /**
  *  Mapper 接口
  *
@@ -11,4 +14,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface HygfReplenishmentMapper extends BaseMapper<HygfReplenishment> {
 
+    List<HygfReplenishmentDto> selectData(Long sequenceNbr);
 }

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

 package com.yeejoin.amos.boot.module.hygf.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.hygf.api.config.UserEmpower;
-import com.yeejoin.amos.boot.module.hygf.api.dto.PeasantHouseholdDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.PeasantHousehold;
 import org.apache.ibatis.annotations.Param;
 

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

@@ -2,4 +2,9 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.hygf.api.mapper.HygfReplenishmentMapper">
 
+    <select id="selectData" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.HygfReplenishmentDto">
+    select * from hygf_replenishment where  preparation_money_id = #{sequenceNbr}
+
+
+    </select>
 </mapper>

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-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/PreparationMoneyController.java

 package com.yeejoin.amos.boot.module.hygf.biz.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.hygf.api.config.UserLimits;
-import com.yeejoin.amos.boot.module.hygf.api.dto.PeasantHouseholdDto;
-import com.yeejoin.amos.boot.module.hygf.api.dto.PreparationMoneyDto;
-import com.yeejoin.amos.boot.module.hygf.api.dto.PreparationPageDto;
-import com.yeejoin.amos.boot.module.hygf.api.dto.UserUnitInformationDto;
+import com.yeejoin.amos.boot.module.hygf.api.dto.*;
 import com.yeejoin.amos.boot.module.hygf.api.entity.DesignInformation;
 import com.yeejoin.amos.boot.module.hygf.api.entity.HygfReplenishment;
 import com.yeejoin.amos.boot.module.hygf.api.entity.PeasantHousehold;
@@ -24,6 +22,7 @@ import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import io.seata.spring.annotation.GlobalTransactional;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
@@ -69,6 +68,7 @@ public class PreparationMoneyController extends BaseController {
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增发货单", notes = "新增发货单")
 	@GlobalTransactional
+	@UserLimits
 	public ResponseModel<PreparationMoney> save( @RequestParam("isSubmit") String isSubmit, @RequestBody PreparationMoney model) {
         AgencyUserModel agencyUserModel= getUserInfo();
 	   model = preparationMoneyServiceImpl.saveOrUpdateObjectNew(model,agencyUserModel, isSubmit);
@@ -278,7 +278,9 @@ public class PreparationMoneyController extends BaseController {
 	@ApiOperation(httpMethod = "POST",value = "补货申请",  notes = "补货申请")
 	@GlobalTransactional
 	public ResponseModel replenishmentSubmit( @RequestBody HygfReplenishment hygfReplenishment) {
-
+//		HygfReplenishment hygfReplenishment1 = new HygfReplenishment();
+//		BeanUtils.copyProperties(hygfReplenishment,hygfReplenishment1);
+//		hygfReplenishment1.setFile(JSON.toJSONString(hygfReplenishment.getFile()));
 		hygfReplenishmentService.save(hygfReplenishment);
 		preparationMoneyServiceImpl.replenishmentSubmit(hygfReplenishment.getPreparationMoneyId());
 		return CommonResponseNewUtil.success();

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());
         }
     }