增加发货管理

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

@@ -44,6 +44,10 @@ public class PeasantHouseholdDto  extends BaseDto {
     @ApiModelProperty(value = "开发方code")
     private String developerCode;
 
+
+    @ApiModelProperty(value = "开发方平台id")
+    private Long developerId;
+
     @ApiModelProperty(value = "定金")
     private Float deposit;
 

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

@@ -76,13 +76,13 @@ public class PreparationMoneyDto  extends BaseDto {
     private String receipt;
 
     @ApiModelProperty(value = "订单状态0未完成1已完成2作废")
-    private Integer documentState;
+    private String documentState;
 
     @ApiModelProperty(value = "发货状态 0 未发货1已发货")
-    private Integer shipmentStatus;
+    private String shipmentStatus;
 
     @ApiModelProperty(value = "到货状态0未到货1已到货")
-    private Integer receivingStatus;
+    private String receivingStatus;
 
     @ApiModelProperty(value = "清单价格")
     private Double inventoryPrice;

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/PreparationPageDto.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.PreparationMoney;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2023/8/17
+ */
+@Data
+public class PreparationPageDto extends Page<PreparationMoney> {
+    String orderBy;
+    Boolean isASC;
+    //时间开始
+    String startDate;
+    //时间结束
+    String endDate;
+
+    String consigneeAddress;//订单区域
+    String dealerId;//经销商
+    String oddNumbers;//发货单号
+    String salesman;//业主类型
+    String documentState;//订单状态未完成已完成作废
+    String shipmentStatus;//发货状态  未发货已发货
+    String receivingStatus;//到货状态未到货已到货
+
+}

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

@@ -36,7 +36,8 @@ public class SurveyInformationDto  extends BaseDto {
 
     @ApiModelProperty(value = "开发方code")
     private String developerCode;
-
+    @ApiModelProperty(value = "开发方平台id")
+    private Long developerId;
     @ApiModelProperty(value = " 业务员id")
     private String salesmanId;
 

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -60,6 +61,8 @@ public class PeasantHousehold extends BaseEntity {
 	@TableField("developer_code")
     private String developerCode;
 
+    @TableField("developer_id")
+    private Long developerId;
     /**
      * 定金
      */

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

@@ -131,22 +131,22 @@ public class PreparationMoney extends BaseEntity {
     private String receipt;
 
     /**
-     * 订单状态0未完成1已完成2作废
+     * 订单状态0未完成1已完成2已作废
      */
 	@TableField("document_state")
-    private Integer documentState;
+    private String documentState;
 
     /**
      * 发货状态 0 未发货1已发货
      */
 	@TableField("shipment_status")
-    private Integer shipmentStatus;
+    private String shipmentStatus;
 
     /**
      * 到货状态0未到货1已到货
      */
 	@TableField("receiving_status")
-    private Integer receivingStatus;
+    private String receivingStatus;
 
     /**
      * 清单价格

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/service/IPeasantHouseholdService.java

@@ -9,4 +9,7 @@ package com.yeejoin.amos.boot.module.hygf.api.service;
  */
 public interface IPeasantHouseholdService {
 
+
+
+
 }

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

@@ -100,8 +100,8 @@ public class PeasantHouseholdController extends BaseController {
 		model.setSurveyInformationId(surveyInformationDto.getSequenceNbr());
 		model.setSurveyOrNot(0);
 		model.setReview(0);
-
 		model.setDeveloperCode(userInfo.getCompanys().get(0).getOrgCode());
+        model.setDeveloperId(userInfo.getCompanys().get(0).getSequenceNbr());
 		model.setDeveloperName(userInfo.getOrgNamesWithoutRole());
 		if(StringUtils.isEmpty(model.getDeveloper())){
 			model.setDeveloper(userInfo.getRealName());
@@ -252,4 +252,6 @@ public class PeasantHouseholdController extends BaseController {
 		}
 		return jsonArray;
 	}
+
+
 }

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.baomidou.mybatisplus.core.metadata.IPage;
+import com.yeejoin.amos.boot.module.hygf.api.dto.PreparationPageDto;
+import com.yeejoin.amos.boot.module.hygf.api.entity.PreparationMoney;
+import io.swagger.annotations.ApiModelProperty;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RestController;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+
+import java.util.Date;
 import java.util.List;
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.PreparationMoneyServiceImpl;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
@@ -94,12 +100,13 @@ public class PreparationMoneyController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/page")
 	@ApiOperation(httpMethod = "GET",value = "发货单分页查询",  notes = "发货单分页查询")
-	public ResponseModel<Page<PreparationMoneyDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
-                    (value = "size") int size) {
-	    Page<PreparationMoneyDto> page = new Page<PreparationMoneyDto>();
-	    page.setCurrent(current);
-	    page.setSize(size);
-	    return ResponseHelper.buildResponse(preparationMoneyServiceImpl.queryForPreparationMoneyPage(page));
+	public ResponseModel<IPage<PreparationMoney>> queryForPage(PreparationPageDto preparationPageDto
+
+
+
+    ) {
+
+	    return ResponseHelper.buildResponse(preparationMoneyServiceImpl.queryForPreparationMoneyPage(preparationPageDto));
 	}
 
 	/**

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

 package com.yeejoin.amos.boot.module.hygf.biz.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageInfo;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
@@ -10,6 +11,7 @@ import com.yeejoin.amos.boot.module.hygf.api.entity.DealerReview;
 import com.yeejoin.amos.boot.module.hygf.api.entity.UnitInfo;
 import com.yeejoin.amos.boot.module.hygf.api.hwsms.SendSmsCode;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.CommerceInfoMapper;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.UnitInfoMapper;
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.DealerReviewServiceImpl;
 import com.yeejoin.amos.component.feign.config.InnerInvokException;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
@@ -78,8 +80,8 @@ public class UnitInfoController extends BaseController {
     DealerReviewServiceImpl dealerReviewServiceImpl;
     @Autowired
     CommerceInfoMapper commerceInfoMapper;
-
-
+    @Autowired
+    UnitInfoMapper unitInfoMapper;
 	/**
 	 * 验证码过期时间
 	 */
@@ -396,6 +398,21 @@ public class UnitInfoController extends BaseController {
     }
 
 
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET",value = "获取经销商单位",   notes = "获取经销商单位")
+    @GetMapping(value = "/getUnit")
+    public ResponseModel< List<UnitInfo>> getUnit( @RequestParam(required = false)String amosCompanySeq) {
+
+        LambdaQueryWrapper<UnitInfo> unitInfoque=new LambdaQueryWrapper<>();
+
+        unitInfoque.eq(!ValidationUtil.isEmpty(amosCompanySeq),UnitInfo::getAmosCompanySeq,amosCompanySeq);
+        unitInfoque.eq(UnitInfo::getAuditStatus,2);
+        List<UnitInfo>  list=unitInfoMapper.selectList(unitInfoque);
+
+        return ResponseHelper.buildResponse(list);
+
+
+    }
 
 
 

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PreparationMoneyServiceImpl.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.PreparationPageDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.PreparationMoney;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.PreparationMoneyMapper;
 import com.yeejoin.amos.boot.module.hygf.api.service.IPreparationMoneyService;
 import com.yeejoin.amos.boot.module.hygf.api.dto.PreparationMoneyDto;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
@@ -18,11 +23,37 @@ import java.util.List;
  */
 @Service
 public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto,PreparationMoney,PreparationMoneyMapper> implements IPreparationMoneyService {
+
+
+    @Autowired
+    private PreparationMoneyMapper preparationMoneyMapper;
+
+
+
     /**
      * 分页查询
      */
-    public Page<PreparationMoneyDto> queryForPreparationMoneyPage(Page<PreparationMoneyDto> page)   {
-        return this.queryForPage(page, null, false);
+    public IPage<PreparationMoney> queryForPreparationMoneyPage(PreparationPageDto  dto)   {
+
+        //列表数据组装
+        QueryWrapper<PreparationMoney> qw = new QueryWrapper<>();
+        qw.ge(StringUtils.isNotEmpty(dto.getStartDate()), "order_time", dto.getStartDate());
+        qw.le(StringUtils.isNotEmpty(dto.getEndDate()), "order_time", dto.getEndDate());
+        qw.eq(StringUtils.isNotEmpty(dto.getConsigneeAddress()), "consignee_address", dto.getConsigneeAddress());
+        qw.eq(StringUtils.isNotEmpty(dto.getDealerId()), "dealer_id", dto.getDealerId());
+        qw.like(StringUtils.isNotEmpty(dto.getOddNumbers()), "odd_numbers", dto.getOddNumbers());
+        qw.like(StringUtils.isNotEmpty(dto.getSalesman()), "salesman", dto.getSalesman());
+        qw.eq(StringUtils.isNotEmpty(dto.getDocumentState()), "document_state", dto.getDocumentState());
+        qw.eq(StringUtils.isNotEmpty(dto.getShipmentStatus()), "shipment_status", dto.getShipmentStatus());
+        qw.eq(StringUtils.isNotEmpty(dto.getReceivingStatus()), "receiving_status", dto.getReceivingStatus());
+        if (StringUtils.isNotEmpty(dto.getOrderBy())) {
+            qw.orderBy(Boolean.TRUE, dto.getIsASC(), dto.getOrderBy());
+        }else{
+            qw.orderBy(Boolean.TRUE, Boolean.FALSE, "order_time");
+        }
+        IPage<PreparationMoney> warningQuestionInfoIPage = preparationMoneyMapper.selectPage(dto, qw);
+
+        return warningQuestionInfoIPage;
     }
 
     /**

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

@@ -262,6 +262,7 @@ public class SurveyInformationServiceImpl extends BaseService<SurveyInformationD
         BeanUtils.copyProperties(peasantHousehold, surveyInfoAllDto.getSurveyInformation());
         surveyInfoAllDto.getSurveyInformation().setDeveloperName(userInfo.getCompanys().get(0).getCompanyName());
         surveyInfoAllDto.getSurveyInformation().setDeveloperCode(userInfo.getCompanys().get(0).getOrgCode());
+        surveyInfoAllDto.getSurveyInformation().setDeveloperId(userInfo.getCompanys().get(0).getSequenceNbr());
         surveyInfoAllDto.getSurveyInformation().setSalesmanId(userInfo.getUserId());
         surveyInfoAllDto.getSurveyInformation().setSalesman(userInfo.getRealName());
         surveyInfoAllDto.getSurveyInformation().setCreator(userInfo.getRealName());