需求设置所需后台

happy-boot-module-flexjob/src/main/java/org/jeecg/modules/api/requirement/entity/HwRequirementAPI.java

@@ -210,4 +210,13 @@ public class HwRequirementAPI implements Serializable {
     //所属平台id
     @TableField(exist = false)
     private Integer platformId;
+
+    //是否自动生成订单（0：否 1：是）
+    private Integer isAutoOrder;
+
+    //是否自动确认订单（0：否 1：是）
+    private Integer isAutoConfirm;
+
+    //手机端是否展示（0：否 1：是）
+    private Integer isMobileDisplay;
 }

happy-boot-module-flexjob/src/main/java/org/jeecg/modules/requiremanager/controller/HwRequirementController.java

@@ -126,8 +126,28 @@ public class HwRequirementController {
 		}
 		return result;
 	}
-	
-	/**
+
+
+	 /**
+	  *  批量删除
+	  * @param ids
+	  * @return
+	  */
+	 @DeleteMapping(value = "/deleteBatch")
+	 public Result<HwRequirement> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		 Result<HwRequirement> result = new Result<HwRequirement>();
+		 if(ids==null || "".equals(ids.trim())) {
+			 result.error500("参数不识别！");
+		 }else {
+			 this.hwRequirementService.removeByIds(Arrays.asList(ids.split(",")));
+			 result.success("删除成功!");
+		 }
+		 return result;
+	 }
+
+
+
+	 /**
 	  *  编辑
 	 * @param hwRequirement
 	 * @return
@@ -187,44 +207,30 @@ public class HwRequirementController {
 
 
 		/**
-		 * 审核需求
+		 * 设置需求
 		 *
 		 * @param hwRequirement
 		 * @return
 		 */
 		@PutMapping(value = "/authRequire")
 		public Result<?> authRequire(@RequestBody HwRequirement hwRequirement) {
-
-			int authenticationStatus=hwRequirement.getAuthenticationStatus();
-			String message = "";
 			try {
 				HwRequirement hwRequirement1=hwRequirementService.getById(hwRequirement.getId());
-				if(authenticationStatus==2){
-					hwRequirement1.setServiceFeeRate(hwRequirement.getServiceFeeRate());
-					hwRequirement1.setSubcontractorFeeRate(hwRequirement.getSubcontractorFeeRate());
-					hwRequirement1.setContractType(hwRequirement.getContractType());
-					hwRequirement1.setServiceContract(hwRequirement.getServiceContract());
-					hwRequirement1.setSubcontract(hwRequirement.getSubcontract());
-					hwRequirement1.setSubcontractType(hwRequirement.getSubcontractType());
-					hwRequirement1.setWorkContractType(hwRequirement.getWorkContractType());
-					if(hwRequirement1.getAuthenticationStatus()==2 && (hwRequirement1.getExpiryDate().getTime()> new Date().getTime())){
-						hwRequirement1.setIsOn(1);
-					}
-				}
-				hwRequirement1.setAuthenticationStatus(authenticationStatus);
-				hwRequirementService.updateById(hwRequirement1);
-				if (hwRequirement1.getAuthenticationStatus() == 2) {
-					message = "审核通过";
-				} else if(hwRequirement1.getAuthenticationStatus() == 1){
-					message = "审核打回";
-				}else if(hwRequirement1.getAuthenticationStatus() == 0){
-					message = "申请审核成功";
-				}
+				hwRequirement1.setServiceFeeRate(hwRequirement.getServiceFeeRate());
+				hwRequirement1.setSubcontractorFeeRate(hwRequirement.getPlatType()==1?hwRequirement.getSubcontractorFeeRate():null);
+				hwRequirement1.setContractType(hwRequirement.getContractType());
+				hwRequirement1.setServiceContract(hwRequirement.getServiceContract());
+				hwRequirement1.setSubcontract(hwRequirement.getPlatType()==1?hwRequirement.getSubcontract():null);
+				hwRequirement1.setSubcontractType(hwRequirement.getPlatType()==1?hwRequirement.getSubcontractType():null);
+				hwRequirement1.setWorkContractType(hwRequirement.getWorkContractType());
+				hwRequirement1.setIsAutoOrder(hwRequirement.getIsAutoOrder());
+				hwRequirement1.setIsAutoConfirm(hwRequirement.getIsAutoConfirm());
+				hwRequirementService.updateByIdHwRequirement(hwRequirement1);
 			} catch (Exception e) {
 				log.error("审核失败", e.getMessage());
 				return Result.error("审核失败!");
 			}
-			return Result.ok(message);
+			return Result.ok("设置成功");
 		}
 
 
@@ -332,20 +338,20 @@ public class HwRequirementController {
 	}
 	
 	/**
-	  *  批量删除
-	 * @param ids
+	  * 需求下是否存在订单（需求设置页面部分参数是否可以修改）
+	 * @param requirementId
 	 * @return
 	 */
-	@DeleteMapping(value = "/deleteBatch")
-	public Result<HwRequirement> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		Result<HwRequirement> result = new Result<HwRequirement>();
-		if(ids==null || "".equals(ids.trim())) {
-			result.error500("参数不识别！");
-		}else {
-			this.hwRequirementService.removeByIds(Arrays.asList(ids.split(",")));
-			result.success("删除成功!");
+	@GetMapping(value = "/isDisabled")
+	public Boolean isDisabled(@RequestParam(name="requirementId",required=true) String requirementId) {
+		Boolean bo=false;
+		//查询需求下是否存在进行中的订单
+		List<HwOrder> list=hwOrderService.findListByRequireId(Integer.parseInt(requirementId));
+		if(list.size()>0){
+			//存在进行中的订单，需求设置页面部分参数不可以修改，返回true
+			bo=true;
 		}
-		return result;
+		return bo;
 	}
 	
 	/**

happy-boot-module-flexjob/src/main/java/org/jeecg/modules/requiremanager/entity/HwRequirement.java

@@ -257,4 +257,17 @@ public class HwRequirement implements Serializable {
     @TableField(exist = false)
     private java.lang.Integer contractQuery;  //用于查询企业合同 1：未上传 2：已上传
 
+
+    //是否自动生成订单（0：否 1：是）
+    private Integer isAutoOrder;
+
+    //是否自动确认订单（0：否 1：是）
+    private Integer isAutoConfirm;
+
+    //手机端是否展示（0：否 1：是）
+    private Integer isMobileDisplay;
+
+
+    @TableField(exist = false)
+    private java.lang.Integer platType;  //是否通过平台 1：是 2：否
 }

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

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

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

@@ -40,6 +40,9 @@
 		a.service_end_date as "serviceEndDate",
 		a.subcontractor_fee_rate as "subcontractorFeeRate",
 		a.remark as "remark",
+		a.is_auto_order as "isAutoOrder",
+		a.is_auto_confirm as "isAutoConfirm",
+		a.is_mobile_display as "isMobileDisplay",
 		hwp.company_name as "companyName",
 		hwp.authentication_status as "companyAuthenticationStatus",
 		(select count(b.id) from hw_enrollment b where b.requirement_id=a.id) as "enrollmentNum"
@@ -81,7 +84,10 @@
 		a.service_end_date as "serviceEndDate",
 		a.service_fee_rate as "serviceFeeRate",
 		a.subcontractor_fee_rate as "subcontractorFeeRate",
-		a.remark as "remark"
+		a.remark as "remark",
+		a.is_auto_order as "isAutoOrder",
+		a.is_auto_confirm as "isAutoConfirm",
+		a.is_mobile_display as "isMobileDisplay"
 	</sql>
 
     <sql id="hwRequirementJoins">
@@ -234,43 +240,18 @@
 		)
 	</insert>
 
-    <update id="updateqq">
+    <update id="updateByIdHwRequirement">
 		UPDATE hw_requirement SET
-			platform_company_id = #{platformCompanyId},
-			code = #{code},
-			name = #{name},
-			trade_type = #{tradeType},
-			description = #{description},
-			qualification = #{qualification},
-			acceptance_criteria = #{acceptanceCriteria},
-			number = #{number},
-			settlement_method = #{settlementMethod},
-			stage = #{stage},
-			price = #{price},
-			province_code = #{provinceCode},
-			city_code = #{cityCode},
-			country_code = #{countryCode},
-			province_city_country = #{provinceCityCountry},
-			address = #{address},
-			contract_type = #{contractType},
-			service_contract = #{serviceContract},
-			authentication_status = #{authenticationStatus},
-			expiry_date = #{expiryDate},
-			sys_org_code = #{sysOrgCode},
-			create_time = #{createTime},
-			create_by = #{createBy},
-			update_time = #{updateTime},
-			update_by = #{updateBy.id},
-			is_on = #{isOn},
-			service_fee_rate = #{serviceFeeRate},
-			subcontract_type = #{subcontractType},
-			subcontract = #{subcontract},
-			work_contract_type = #{workContractType},
-			service_start_date = #{serviceStartDate},
-			service_end_date = #{serviceEndDate},
-			subcontractor_fee_rate = #{subcontractorFeeRate},
-			remark = #{remark}
-		WHERE id = #{id}
+			service_fee_rate = #{hwRequirement.serviceFeeRate},
+			contract_type = #{hwRequirement.contractType},
+			service_contract = #{hwRequirement.serviceContract},
+            subcontractor_fee_rate = #{hwRequirement.subcontractorFeeRate},
+			subcontract_type = #{hwRequirement.subcontractType},
+			subcontract = #{hwRequirement.subcontract},
+			work_contract_type = #{hwRequirement.workContractType},
+	        is_auto_order = #{hwRequirement.isAutoOrder},
+			is_auto_confirm = #{hwRequirement.isAutoConfirm}
+		WHERE id = #{hwRequirement.id}
 	</update>
 
 

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

@@ -39,4 +39,6 @@ public interface IHwRequirementService extends IService<HwRequirement> {
     List<HwRequirement> findRequireList();
 
     Result<HwOrder> generateOrderMany(HwOrder hwOrder1);
+
+    void updateByIdHwRequirement(HwRequirement hwRequirement1);
 }

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

@@ -101,6 +101,12 @@ public class HwRequirementServiceImpl extends ServiceImpl<HwRequirementMapper, H
         hwRequirement.setUpdateTime(new Date());
         hwRequirement.setUpdateBy(sysUser.getUsername());
         hwRequirement.setIsOn(1);
+         //设置几个默认值
+        hwRequirement.setServiceFeeRate(10.00);
+        hwRequirement.setContractType(1);
+        hwRequirement.setSubcontractorFeeRate(8.00);
+        hwRequirement.setSubcontractType(1);
+        hwRequirement.setWorkContractType(1);
         save(hwRequirement);
     }
 
@@ -527,4 +533,11 @@ public class HwRequirementServiceImpl extends ServiceImpl<HwRequirementMapper, H
         }
         return result;
     }
+
+
+    @Override
+    @Transactional
+    public void updateByIdHwRequirement(HwRequirement hwRequirement1) {
+        baseMapper.updateByIdHwRequirement(hwRequirement1);
+    }
 }