问题处理

hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractServiceImpl.java

@@ -602,7 +602,6 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
         List<ContractProduct> contractProductList = contractProductService.list(q -> q.eq(ContractProduct::getContractId, id));
         productInfoService.attributeAssign(contractProductList, ContractProduct::getProductId, (item, product) -> {
             item.setProductCnName(product.getName());
-            item.setProductName(product.getName());
             item.setProductCode(product.getCode());
             item.setProductUnit(product.getUnit());
         });

hx-sale/src/main/java/com/fjhx/sale/service/sample/impl/SampleServiceImpl.java

@@ -467,7 +467,7 @@ public class SampleServiceImpl extends ServiceImpl<SampleMapper, Sample> impleme
         Map<Long, SysUser> nickNameMapByIds = UserUtil.getMapByIds(Arrays.asList(sample.getCreateUser()));
         SysUser sysUser = nickNameMapByIds.get(sample.getCreateUser());
         contractPdfInfoVo.setCreateUserName(sysUser.getNickName());//中文名
-        contractPdfInfoVo.setCreateUserName(sysUser.getNickNameEn());//英文名
+        contractPdfInfoVo.setCreateUserNameEn(sysUser.getNickNameEn());//英文名
         //赋值创建人邮箱地址
         List<EnterpriseMailbox> enterpriseMailboxList = enterpriseMailboxService.list(q -> q.eq(EnterpriseMailbox::getUserId, sample.getCreateUser()));
         String eMailAddress = "";

hx-sale/src/main/resources/mapper/contract/ContractProductMapper.xml

@@ -54,7 +54,7 @@
                 LEFT JOIN ehsd_quality t3 ON t1.id = t3.business_id
                 WHERE
                     t2.`status` >= 30
-                    AND t2.`status` < 88 AND t1.expend_quantity > 0
+                    AND t2.`status` < 88
         UNION ALL
                 SELECT
                     IFNULL(t3.`status`,0) AS qualityStatus,
@@ -78,7 +78,7 @@
                     LEFT JOIN ehsd_quality t3 ON t1.id = t3.business_id
                     WHERE
                     t2.`status` >= 30
-                    AND t2.`status` < 88 AND t1.expend_quantity > 0
+                    AND t2.`status` < 88
         ) t1
             ${ew.customSqlSegment}
     </select>