楚江ERP：获取备注和具体质量要求

@@ -86,6 +86,7 @@ create table if not exists `tbl_contract_distributor_standard`
     `dept_id`                    varchar(32)  not null comment '办事处',
     `order_date`                 date         NOT NULL COMMENT '订货日期',
     `unit`                       VARCHAR(50) COMMENT '单位',
+    `workshop_id`                varchar(32) comment '生产厂',
     `total_quantity`             DECIMAL(15, 4) COMMENT '合计数量',
     `total_amount_excluding_tax` DECIMAL(15, 4) COMMENT '合计不含税金额',
     `total_amount_including_tax` DECIMAL(15, 4) COMMENT '合计总金额',

@@ -90,6 +90,18 @@ public class GetContractDistributorStandardBo extends BaseBo<ContractDistributor
     private String unitName;
 
     /**
+     * 生产厂
+     */
+    @ApiModelProperty("生产厂")
+    private String workshopId;
+
+    /**
+     * 生产厂名称
+     */
+    @ApiModelProperty("生产厂名称")
+    private String workshopName;
+
+    /**
      * 合计人民币金额（大写）
      */
     @ApiModelProperty("合计人民币金额（大写）")

@@ -145,12 +145,16 @@ public class QueryContractDistributorStandardBo extends BaseBo<ContractDistribut
     @ApiModelProperty(value = "正式合同是否审核完成(AUDIT:审核中,PASS:审核通过,REFUSE:已驳回,CANCEL:已取消)")
     private String formalApproved;
 
+    private String formalApprovedName;
+
     /**
      * 标准合同是否审核完成(AUDIT:审核中,PASS:审核通过,REFUSE:已驳回,CANCEL:已取消)
      */
     @ApiModelProperty(value = "标准合同是否审核完成(AUDIT:审核中,PASS:审核通过,REFUSE:已驳回,CANCEL:已取消)")
     private String standardApproved;
 
+    private String standardApprovedName;
+
     /**
      * 是否展示审核按钮(非持久化字段)
      */

@@ -21,7 +21,9 @@ import com.lframework.starter.web.inner.service.system.SysDataDicItemService;
 import com.lframework.starter.web.inner.service.system.SysDeptService;
 import com.lframework.starter.web.inner.service.system.SysUserService;
 import com.lframework.xingyun.basedata.entity.Customer;
+import com.lframework.xingyun.basedata.entity.Workshop;
 import com.lframework.xingyun.basedata.service.customer.CustomerService;
+import com.lframework.xingyun.basedata.service.workshop.WorkshopService;
 import com.lframework.xingyun.basedata.vo.customer.QueryCustomerVo;
 import com.lframework.xingyun.sc.bo.contract.GetContractDistributorLineBo;
 import com.lframework.xingyun.sc.bo.contract.GetContractDistributorStandardBo;
@@ -76,6 +78,8 @@ public class ContractDistributorStandardController extends DefaultBaseController
     private GenerateCodeService generateCodeService;
     @Autowired
     private DicCityService dicCityService;
+    @Autowired
+    private WorkshopService workshopService;
 
 
     public static final String SUPPLIER_DIC_CODE = "SUPPLIER"; // 所属单位/供方
@@ -83,6 +87,7 @@ public class ContractDistributorStandardController extends DefaultBaseController
     public static final String CONTRACT_PRODUCT_DIC_CODE = "CONTRACT_PRODUCT"; // 合同产品名称
     public static final String CONDITIONS_REQUIRED_DIC_CODE = "CONDITIONS_REQUIRED"; // 特别条款要求
     public static final String APPLICABLE_STANDARD_DIC_CODE = "APPLICABLE_STANDARD"; // 执行标准
+    public static final String AUDIT_STATUS_DIC_CODE = "AUDIT_STATUS"; // 审核状态
 
     /**
      * 查询列表
@@ -138,6 +143,10 @@ public class ContractDistributorStandardController extends DefaultBaseController
         Map<String, Customer> customerMap = CollectionUtils.emptyIfNull(customerService.listByIds(buyerIdList))
                 .stream()
                 .collect(Collectors.toMap(Customer::getId, Function.identity()));
+        List<SysDataDicItem> sysDataDicItemList = sysDataDicItemService.findByDicCode(AUDIT_STATUS_DIC_CODE);
+        Map<String, String> auditCodeAndNameMap = CollectionUtils.emptyIfNull(sysDataDicItemList)
+                .stream()
+                .collect(Collectors.toMap(SysDataDicItem::getCode, SysDataDicItem::getName));
         boList.forEach(bo -> {
             if (bo == null) {
                 return;
@@ -164,6 +173,14 @@ public class ContractDistributorStandardController extends DefaultBaseController
                     bo.setDistrictName(dicCityDtoList.get(2).getName());
                 }
             }
+
+            if (StringUtils.isNotBlank(bo.getFormalApproved())) {
+                bo.setFormalApprovedName(auditCodeAndNameMap.get(bo.getFormalApproved()));
+            }
+
+            if (StringUtils.isNotBlank(bo.getStandardApproved())) {
+                bo.setStandardApprovedName(auditCodeAndNameMap.get(bo.getStandardApproved()));
+            }
         });
 
         boPageResult.setDatas(boList);
@@ -204,6 +221,8 @@ public class ContractDistributorStandardController extends DefaultBaseController
         result.setSpecialTermsName(requiredDicItem == null ? "" : requiredDicItem.getName());
         SysDataDicItem standardDicItem = sysDataDicItemService.findByCode(APPLICABLE_STANDARD_DIC_CODE, result.getExecutionStandard());
         result.setExecutionStandardName(standardDicItem == null ? "" : standardDicItem.getName());
+        Workshop workshop = workshopService.findById(result.getWorkshopId());
+        result.setWorkshopName(workshop == null ? "" : workshop.getName());
 
         List<DicCityDto> dicCityDtoList = dicCityService.getChainById(result.getDestination());
         if (CollectionUtils.isNotEmpty(dicCityDtoList) && dicCityDtoList.size() == 3) {
@@ -342,4 +361,48 @@ public class ContractDistributorStandardController extends DefaultBaseController
 
         return InvokeResultBuilder.success();
     }
+
+    /**
+     * 获取合同备注
+     */
+    @ApiOperation("获取合同备注")
+    @GetMapping("/getCustomerRemarks")
+    public InvokeResult<List<String>> getCustomerRemarks(@NotBlank(message = "客户信息不可为空") String customerId) {
+        Wrapper<ContractDistributorStandard> wrapper = Wrappers.lambdaQuery(ContractDistributorStandard.class)
+                .eq(ContractDistributorStandard::getBuyer, customerId)
+                .ne(ContractDistributorStandard::getStatus, "DELETED")
+                .isNotNull(ContractDistributorStandard::getRemarks)
+                .orderByDesc(ContractDistributorStandard::getCreateTime);
+        List<ContractDistributorStandard> contractDistributorStandardList = contractDistributorStandardService.list(wrapper);
+        if (CollectionUtils.isEmpty(contractDistributorStandardList)) {
+            return InvokeResultBuilder.success(new ArrayList<>(0));
+        }
+
+        List<String> remarksList = contractDistributorStandardList.stream()
+                .map(ContractDistributorStandard::getRemarks)
+                .filter(StringUtils::isNotEmpty)
+                .limit(3)  // 限制前3个
+                .collect(Collectors.toList());
+
+        return InvokeResultBuilder.success(remarksList);
+    }
+
+    /**
+     * 获取具体质量要求
+     */
+    @ApiOperation("获取具体质量要求")
+    @GetMapping("/getCustomerSpecificQualityRequirements")
+    public InvokeResult<GetContractDistributorStandardBo> getCustomerSpecificQualityRequirements(
+            @RequestParam String customerId, @RequestParam List<String> productIdList) {
+        if (CollectionUtils.isEmpty(productIdList)) {
+            throw new DefaultClientException("产品信息不可为空");
+        }
+
+        ContractDistributorStandard contractDistributorStandard = contractDistributorStandardService.getCustomerSpecificQualityRequirements(customerId, productIdList);
+        if (contractDistributorStandard == null) {
+            return InvokeResultBuilder.success(new GetContractDistributorStandardBo());
+        }
+
+        return InvokeResultBuilder.success(new GetContractDistributorStandardBo(contractDistributorStandard));
+    }
 }

@@ -63,6 +63,11 @@ public class ContractDistributorStandard extends BaseEntity implements BaseDto {
     private String unit;
 
     /**
+     * 生产厂
+     */
+    private String workshopId;
+
+    /**
      * 合计人民币金额（大写）
      */
     private String totalAmountCapital;

@@ -116,6 +116,7 @@ public class ContractDistributorStandardServiceImpl extends
         data.setDeptId(vo.getDeptId());
         data.setOrderDate(vo.getOrderDate());
         data.setUnit(vo.getUnit());
+        data.setWorkshopId(vo.getWorkshopId());
         data.setTotalAmountCapital(vo.getTotalAmountCapital());
         data.setDepositInfo(vo.getDepositInfo());
         data.setPackagingRequirements(vo.getPackagingRequirements());
@@ -173,6 +174,7 @@ public class ContractDistributorStandardServiceImpl extends
                 .set(ContractDistributorStandard::getBuyer, vo.getBuyer())
                 .set(ContractDistributorStandard::getOrderDate, vo.getOrderDate())
                 .set(ContractDistributorStandard::getUnit, vo.getUnit())
+                .set(ContractDistributorStandard::getWorkshopId, vo.getWorkshopId())
                 .set(ContractDistributorStandard::getTotalAmountCapital, vo.getTotalAmountCapital())
                 .set(ContractDistributorStandard::getDepositInfo, vo.getDepositInfo())
                 .set(ContractDistributorStandard::getPackagingRequirements, vo.getPackagingRequirements())
@@ -392,6 +394,60 @@ public class ContractDistributorStandardServiceImpl extends
         OpLogUtil.setExtra(vo);
     }
 
+    @Override
+    public ContractDistributorStandard getCustomerSpecificQualityRequirements(String customerId, List<String> productIdList) {
+        if (StringUtils.isBlank(customerId) || CollectionUtils.isEmpty(productIdList)) {
+            return new ContractDistributorStandard();
+        }
+
+        List<ContractDistributorStandard> contractDistributorStandardList = getBaseMapper().getCustomerSpecificQualityRequirements(customerId, productIdList);
+        if (CollectionUtils.isEmpty(contractDistributorStandardList)) {
+            return new ContractDistributorStandard();
+        }
+
+        StringBuffer pieceWeightHeadBuffer = new StringBuffer();
+        StringBuffer surfaceBuffer = new StringBuffer();
+        StringBuffer toleranceBuffer = new StringBuffer();
+        StringBuffer performanceBuffer = new StringBuffer();
+        StringBuffer componentBuffer = new StringBuffer();
+        StringBuffer packagingBuffer = new StringBuffer();
+
+        contractDistributorStandardList.forEach(contractDistributorStandard -> {
+            if (StringUtils.isNotBlank(contractDistributorStandard.getPieceWeightHead())) {
+                pieceWeightHeadBuffer.append(contractDistributorStandard.getPieceWeightHead()).append("\n");
+            }
+
+            if (StringUtils.isNotBlank(contractDistributorStandard.getSurface())) {
+                surfaceBuffer.append(contractDistributorStandard.getSurface()).append("\n");
+            }
+
+            if (StringUtils.isNotBlank(contractDistributorStandard.getTolerance())) {
+                toleranceBuffer.append(contractDistributorStandard.getTolerance()).append("\n");
+            }
+
+            if (StringUtils.isNotBlank(contractDistributorStandard.getPerformance())) {
+                performanceBuffer.append(contractDistributorStandard.getPerformance()).append("\n");
+            }
+
+            if (StringUtils.isNotBlank(contractDistributorStandard.getComponent())) {
+                componentBuffer.append(contractDistributorStandard.getComponent()).append("\n");
+            }
+
+            if (StringUtils.isNotBlank(contractDistributorStandard.getPackaging())) {
+                packagingBuffer.append(contractDistributorStandard.getPackaging()).append("\n");
+            }
+        });
+
+        ContractDistributorStandard contractDistributorStandard = new ContractDistributorStandard();
+        contractDistributorStandard.setPieceWeightHead(pieceWeightHeadBuffer.toString());
+        contractDistributorStandard.setSurface(surfaceBuffer.toString());
+        contractDistributorStandard.setTolerance(toleranceBuffer.toString());
+        contractDistributorStandard.setPerformance(performanceBuffer.toString());
+        contractDistributorStandard.setComponent(componentBuffer.toString());
+        contractDistributorStandard.setPackaging(packagingBuffer.toString());
+        return contractDistributorStandard;
+    }
+
     @CacheEvict(value = ContractDistributorStandard.CACHE_NAME, key = "@cacheVariables.tenantId() + #key")
     @Override
     public void cleanCacheByKey(Serializable key) {

@@ -21,4 +21,6 @@ public interface ContractDistributorStandardMapper extends BaseMapper<ContractDi
      * @return
      */
     List<ContractDistributorStandard> query(@Param("vo") QueryContractDistributorStandardVo vo);
+
+    List<ContractDistributorStandard> getCustomerSpecificQualityRequirements(@Param("customerId") String customerId, @Param("productIdList") List<String> productIdList);
 }

@@ -72,4 +72,13 @@ public interface ContractDistributorStandardService extends BaseMpService<Contra
 
     void deleteContract(String id);
 
+    /**
+     * 获取具体质量要求，多个数据拼接成一个
+     *
+     * @param customerId
+     * @param productIdList
+     * @return
+     */
+    ContractDistributorStandard getCustomerSpecificQualityRequirements(String customerId,List<String> productIdList);
+
 }
\ No newline at end of file

@@ -68,6 +68,13 @@ public class CreateContractDistributorStandardVo implements BaseVo, Serializable
     private String unit;
 
     /**
+     * 生产厂
+     */
+    @ApiModelProperty(value = "生产厂")
+    @Length(message = "单位最多允许50个字符！")
+    private String workshopId;
+
+    /**
      * 合计人民币金额（大写）
      */
     @ApiModelProperty(value = "合计人民币金额（大写）", required = true)

@@ -67,5 +67,17 @@ public class QueryContractDistributorStandardVo extends PageVo implements BaseVo
 
     @ApiModelProperty("类型")
     private String type;
+
+    /**
+     * 正式合同是否审核完成(AUDIT:审核中,PASS:审核通过,REFUSE:已驳回,CANCEL:已取消)
+     */
+    @ApiModelProperty(value = "正式合同是否审核完成(AUDIT:审核中,PASS:审核通过,REFUSE:已驳回,CANCEL:已取消)")
+    private String formalApproved;
+
+    /**
+     * 标准合同是否审核完成(AUDIT:审核中,PASS:审核通过,REFUSE:已驳回,CANCEL:已取消)
+     */
+    @ApiModelProperty(value = "标准合同是否审核完成(AUDIT:审核中,PASS:审核通过,REFUSE:已驳回,CANCEL:已取消)")
+    private String standardApproved;
 }
 

@@ -71,6 +71,13 @@ public class UpdateContractDistributorStandardVo implements BaseVo, Serializable
     private String unit;
 
     /**
+     * 生产厂
+     */
+    @ApiModelProperty(value = "生产厂")
+    @Length(message = "单位最多允许50个字符！")
+    private String workshopId;
+
+    /**
      * 合计人民币金额（大写）
      */
     @ApiModelProperty(value = "合计人民币金额（大写）", required = true)

@@ -10,6 +10,7 @@
         <result column="dept_id" property="deptId"/>
         <result column="order_date" property="orderDate"/>
         <result column="unit" property="unit"/>
+        <result column="workshop_id" property="workshopId"/>
         <result column="total_amount_capital" property="totalAmountCapital"/>
         <result column="deposit_info" property="depositInfo"/>
         <result column="packaging_requirements" property="packagingRequirements"/>
@@ -65,6 +66,7 @@
             tb.dept_id,
             tb.order_date,
             tb.unit,
+            tb.workshop_id,
             tb.total_amount_capital,
             tb.deposit_info,
             tb.packaging_requirements,
@@ -145,6 +147,33 @@
             <if test="vo.type != null">
                 AND tb.type = #{vo.type}
             </if>
+            <if test="vo.formalApproved != null">
+                AND tb.formalApproved = #{vo.formalApproved}
+            </if>
+            <if test="vo.standardApproved != null">
+                AND tb.standardApproved = #{vo.standardApproved}
+            </if>
         </where>
+        order by tb.create_time desc
+    </select>
+
+    <select id="getCustomerSpecificQualityRequirements" resultMap="ContractDistributorStandard">
+        WITH LatestContracts AS (SELECT cdl.product_id,
+        cdl.contract_id,
+        cds.*,
+        ROW_NUMBER() OVER (PARTITION BY cdl.product_id ORDER BY cds.create_time DESC, cds.id DESC) as rn
+        FROM tbl_contract_distributor_line cdl
+        INNER JOIN tbl_contract_distributor_standard cds ON cdl.contract_id = cds.id
+        WHERE cds.STATUS != 'DELETED'
+        and cds.buyer = #{customerId}
+        and cdl.product_id IN
+        <foreach collection="productIdList" open="(" separator="," close=")" item="item">
+            #{item}
+        </foreach>
+        )
+        SELECT *
+        FROM LatestContracts
+        WHERE rn = 1
+        ORDER BY create_time;
     </select>
 </mapper>