增加接口

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

+package com.yeejoin.amos.boot.module.hygf.api.Enum;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2023/8/21
+ */
+@Getter
+@AllArgsConstructor
+public enum   HouseholdContractEnum {
+
+    发起状态_已发起("已发起", "已发起"),
+    发起状态_未发起("未发起", "未发起"),
+    验证状态_已验证("已验证", "已验证"),
+    验证状态_未验证("未验证", "未验证"),
+    盖章状态_未盖章("未盖章", "未盖章"),
+    盖章状态_已盖章("已盖章", "已盖章"),
+    签字状态_已签字("已签字", "已签字"),
+    签字状态_未签字("未签字", "未签字"),
+    勘察状态_未勘察("未勘察", "未勘察"),
+    勘察状态_已勘察("已勘察", "已勘察"),
+    合同状态_未签署("未签署", "未签署"),
+    合同状态_已签署("已签署", "已签署"),
+    合同状态_已作废("已作废", "已作废");
+    /**
+     * 名称，描述
+     */
+    private String name;
+    /**
+     * 编码
+     */
+    private String code;
+
+    public static PowerStationNodeEnum getNodeByCode(String code) {
+        PowerStationNodeEnum powerStationNodeEnum = null;
+        for(PowerStationNodeEnum type: PowerStationNodeEnum.values()) {
+            if (type.getCode().equals(code)) {
+                powerStationNodeEnum = type;
+                break;
+            }
+        }
+        return powerStationNodeEnum;
+    }
+}

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

 package com.yeejoin.amos.boot.module.hygf.api.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
@@ -123,4 +124,16 @@ public class HouseholdContractDto  extends BaseDto {
     private Double contractLockId;
     @ApiModelProperty(value = "印章id")
     private Double sealId;
+
+    /**
+     *  发起状态
+     * */
+    private String initiateStatus;
+    /**
+     *  签署时间
+     * */
+
+    private Date signingTime;
+
+
 }

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

+package com.yeejoin.amos.boot.module.hygf.api.dto;
+
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.hygf.api.entity.HouseholdContract;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2023/8/21
+ */
+@Data
+public class HouseholdContractPageDto extends Page<HouseholdContract> {
+
+    String orderBy;
+    Boolean isASC;
+    //合同名称
+    String name;
+    /**
+     *  发起状态
+     * */
+    private String initiateStatus;
+
+    /**
+     * 农户id
+     */
+    private Long peasantHouseholdId;
+    /**
+     * 经销商id
+     */
+    private Long dealerId;
+    /**
+     * 勘察状态
+     */
+    private String surveyStatus;
+    /**
+     * 签字状态
+     */
+    private String signStatus;
+}

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

@@ -226,4 +226,17 @@ public class HouseholdContract extends BaseEntity {
     private Double contractLockId;
     @TableField("seal_id")
     private Double sealId;
+
+    /**
+     *  发起状态
+     * */
+    @TableField("initiate_status")
+    private String initiateStatus;
+    /**
+     *  签署时间
+     * */
+
+    @TableField("signing_time")
+    private Date signingTime;
+
 }

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

@@ -181,5 +181,11 @@ public class PreparationMoney extends BaseEntity {
      */
 	@TableField("total_price")
     private Double totalPrice;
+	/**
+     *
+     * 验证 状态
+     * */
 
+    @TableField("validating")
+    private  String  validating;
 }

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

 package com.yeejoin.amos.boot.module.hygf.biz.controller;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yeejoin.amos.boot.module.hygf.api.dto.HouseholdContractPageDto;
+import com.yeejoin.amos.boot.module.hygf.api.entity.HouseholdContract;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
@@ -94,12 +97,8 @@ public class HouseholdContractController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/page")
 	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
-	public ResponseModel<Page<HouseholdContractDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
-                    (value = "size") int size) {
-	    Page<HouseholdContractDto> page = new Page<HouseholdContractDto>();
-	    page.setCurrent(current);
-	    page.setSize(size);
-	    return ResponseHelper.buildResponse(householdContractServiceImpl.queryForHouseholdContractPage(page));
+	public ResponseModel<IPage< HouseholdContract > > queryForPage(HouseholdContractPageDto dto) {
+	    return ResponseHelper.buildResponse(householdContractServiceImpl.queryForPreparationMoneyPage(dto));
 	}
 
 	/**

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

 package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yeejoin.amos.boot.module.hygf.api.dto.HouseholdContractPageDto;
+import com.yeejoin.amos.boot.module.hygf.api.dto.PreparationPageDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.HouseholdContract;
+import com.yeejoin.amos.boot.module.hygf.api.entity.PreparationMoney;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.HouseholdContractMapper;
 import com.yeejoin.amos.boot.module.hygf.api.service.IHouseholdContractService;
 import com.yeejoin.amos.boot.module.hygf.api.dto.HouseholdContractDto;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -17,17 +27,59 @@ import java.util.List;
  */
 @Service
 public class HouseholdContractServiceImpl extends BaseService<HouseholdContractDto,HouseholdContract,HouseholdContractMapper> implements IHouseholdContractService {
-    /**
-     * 分页查询
-     */
-    public Page<HouseholdContractDto> queryForHouseholdContractPage(Page<HouseholdContractDto> page)   {
-        return this.queryForPage(page, null, false);
-    }
 
+
+    @Autowired
+    HouseholdContractMapper householdContractMapper;
     /**
      * 列表查询 示例
      */
     public List<HouseholdContractDto> queryForHouseholdContractList()   {
         return this.queryForList("" , false);
     }
+
+
+    /**
+     * 分页查询
+     */
+    public IPage<HouseholdContract> queryForPreparationMoneyPage(HouseholdContractPageDto dto)   {
+
+        //列表数据组装
+        QueryWrapper<HouseholdContract> qw = new QueryWrapper<>();
+        qw.like(StringUtils.isNotEmpty(dto.getName()), "name", dto.getName());
+        qw.eq(StringUtils.isNotEmpty(dto.getInitiateStatus()), "initiate_status",dto.getInitiateStatus() );
+
+        qw.eq(dto.getPeasantHouseholdId()!=null, "peasant_household_id",dto.getPeasantHouseholdId() );
+        qw.eq(dto.getDealerId()!=null, "dealer_id",dto.getDealerId() );
+        qw.eq(StringUtils.isNotEmpty(dto.getInitiateStatus()), "initiate_status",dto.getInitiateStatus() );
+        qw.eq(StringUtils.isNotEmpty(dto.getSurveyStatus()), "survey_status",dto.getSurveyStatus() );
+        qw.eq(StringUtils.isNotEmpty(dto.getSignStatus()), "sign_status",dto.getSignStatus() );
+
+        if (StringUtils.isNotEmpty(dto.getOrderBy())) {
+            qw.orderBy(Boolean.TRUE, dto.getIsASC(), dto.getOrderBy());
+        }else{
+            qw.orderBy(Boolean.TRUE, Boolean.FALSE, "rec_date");
+        }
+        IPage<HouseholdContract> warningQuestionInfoIPage = householdContractMapper.selectPage(dto, qw);
+
+        return warningQuestionInfoIPage;
+    }
+
+    //农户注册成功后生成合同
+
+    public void addHouseholdContract(HouseholdContract householdContract){
+
+        householdContract.setContractNumber(this.getnum());//合同编号
+
+        householdContractMapper.insert(householdContract);
+    }
+
+    public String getnum() {
+        SimpleDateFormat format = new SimpleDateFormat("YYYYMMddHHmmssSSS");
+        Date date = new Date();
+        String s = "HT"+format.format(date);
+        return s;
+    }
+
+
 }
\ No newline at end of file