修改导入付款

happy-boot-module-flexjob/src/main/java/org/jeecg/modules/hwpayment/entity/HwPaymentDetailExport.java

@@ -43,4 +43,6 @@ public class HwPaymentDetailExport implements Serializable {
 	private Integer id;//序号
 
 	private String phone;
+
+	private String orderId;
 }

happy-boot-module-flexjob/src/main/java/org/jeecg/modules/hwpayment/service/impl/HwPaymentDetailServiceImpl.java

@@ -209,7 +209,7 @@ public class HwPaymentDetailServiceImpl extends ServiceImpl<HwPaymentDetailMappe
                     resultlist.add(map1);
                     return resultlist;
                 }
-                hwRequirement = hwRequirementService.getById(requirementId);
+                hwRequirement = hwRequirementService.getByRequiredCode(requirementId);
                 if (!hwPlatformCompany.getId().equals(hwRequirement.getPlatformCompanyId())) {
                     map1.put("reason", "需求所属企业与当前登录人企业不符");
                     resultlist.add(map1);
@@ -268,8 +268,10 @@ public class HwPaymentDetailServiceImpl extends ServiceImpl<HwPaymentDetailMappe
                     resultlist.add(map);
                     continue;
                 } else {
-                    List<HwOrder> hwOrderList = hwOrderService.findHwOrderListByIdcardAndRequireId(requirementId,idcardNumber);
+                    hwRequirement = hwRequirementService.getByRequiredCode(requirementId);
+                    List<HwOrder> hwOrderList = hwOrderService.findHwOrderListByIdcardAndRequireId(String.valueOf(hwRequirement.getId()),idcardNumber);
                     if (hwOrderList.size() > 0) {
+                        hwPaymentDetailList.get(j).setOrderId(hwOrderList.get(0).getOrderNumber());
                         if (hwOrderList.get(0).getStatus() != 2) {
                             map.put("id", j + 9);
                             map.put("requirementId", requirementId);

happy-boot-module-flexjob/src/main/java/org/jeecg/modules/requiremanager/mapper/HwRequirementMapper.java

@@ -31,4 +31,6 @@ public interface HwRequirementMapper extends BaseMapper<HwRequirement> {
     List<HwRequirement> findRequireList();
 
     void updateByIdHwRequirement(@Param("hwRequirement")HwRequirement hwRequirement1);
+
+    HwRequirement getByRequiredCode(@Param("requirementCode")String requirementId);
 }

happy-boot-module-flexjob/src/main/java/org/jeecg/modules/requiremanager/mapper/xml/HwRequirementMapper.xml

@@ -240,4 +240,12 @@
 		<include refid="hwRequirementJoins"/>
 		WHERE   a.is_on=1
 	</select>
+
+	<select id="getByRequiredCode" resultType="org.jeecg.modules.requiremanager.entity.HwRequirement">
+		SELECT
+		<include refid="hwRequirementColumns1"/>
+		FROM hw_requirement a
+		<include refid="hwRequirementJoins"/>
+		WHERE   a.code=#{requirementCode}
+	</select>
 </mapper>

happy-boot-module-flexjob/src/main/java/org/jeecg/modules/requiremanager/service/IHwRequirementService.java

@@ -49,4 +49,6 @@ public interface IHwRequirementService extends IService<HwRequirement> {
     Result<HwRequirement> updateHwRequirementById(HwRequirement hwRequirement,HwPlatformCompany hwPlatformCompany);
 
     void removeRequirement(HwRequirement hwRequirement);
+
+    HwRequirement getByRequiredCode(String requirementId);
 }

happy-boot-module-flexjob/src/main/java/org/jeecg/modules/requiremanager/service/impl/HwRequirementServiceImpl.java

@@ -995,4 +995,9 @@ public class HwRequirementServiceImpl extends ServiceImpl<HwRequirementMapper, H
             throw new JeecgBootException("删除失败");
         }
     }
+
+    @Override
+    public HwRequirement getByRequiredCode(String requirementId) {
+        return baseMapper.getByRequiredCode(requirementId);
+    }
 }