新增项目号

csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/vo/ServiceRequirementsVO.java

@@ -116,5 +116,6 @@ public class ServiceRequirementsVO implements Serializable {
     @ApiModelProperty(value = "订单总共需要多少人")
     private Integer requireNum;
 
-
+    @ApiModelProperty(value = "订单项目号")
+    private String projectCode;
 }

release-service/src/main/java/com/mmc/csf/release/entity/requirements/ServiceRequirementsDO.java

@@ -148,6 +148,8 @@ public class ServiceRequirementsDO {
     @ApiModelProperty(value = "订单总共所需多少人")
     private Integer requireNum;
 
+    @ApiModelProperty(value = "订单项目号")
+    private String projectCode;
     public ServiceRequirementsDO(ServiceRequirementsVO serviceRequirementsVO) {
         this.id = serviceRequirementsVO.getId();
         this.userAccountId = serviceRequirementsVO.getUserAccountId();
@@ -175,6 +177,7 @@ public class ServiceRequirementsDO {
         this.cityCode = serviceRequirementsVO.getCityCode();
         this.districtCode = serviceRequirementsVO.getDistrictCode();
         this.requireNum = serviceRequirementsVO.getRequireNum();
+        this.projectCode = serviceRequirementsVO.getProjectCode();
     }
 
 

release-service/src/main/java/com/mmc/csf/release/entity/requirements/ServiceRequirementsSonDO.java

@@ -148,6 +148,8 @@ public class ServiceRequirementsSonDO {
     @ApiModelProperty(value = "上级订单id")
     private Integer fatherRequireId;
 
+    @ApiModelProperty(value = "订单项目号")
+    private String projectCode;
     public ServiceRequirementsSonDO(ServiceRequirementsDO serviceRequirementsDO) {
         BigDecimal decimalSum = new BigDecimal(serviceRequirementsDO.getRequireNum());
         this.serviceId = serviceRequirementsDO.getServiceId();
@@ -184,5 +186,6 @@ public class ServiceRequirementsSonDO {
         this.serviceName = serviceRequirementsDO.getServiceName();
         this.requireNum = 1;
         this.fatherRequireId = serviceRequirementsDO.getId();
+        this.projectCode = serviceRequirementsDO.getProjectCode();
     }
 }

release-service/src/main/resources/mapper/requirements/RequirementsDao.xml

@@ -519,12 +519,12 @@
                                       require_description, create_time,
                                       update_time, task_start_time, task_end_time, task_address, longitude,
                                       latitude, publisher_number, insurance, publish,
-                                      service_flow_id, adcode, order_level_amount, openid, service_name,province_code,city_code,district_code,require_num,repertory)
+                                      service_flow_id, adcode, order_level_amount, openid, service_name,province_code,city_code,district_code,require_num,repertory,project_code)
         VALUES (#{serviceId}, #{userAccountId}, #{publishName}, #{publishPhone},
                 #{requireDescription}, NOW(),
                 NOW(), #{taskStartTime}, #{taskEndTime}, #{taskAddress}, #{longitude},
                 #{latitude}, #{publisherNumber}, #{insurance}, 1, 1, #{adcode}, #{orderLevelAmount}, #{openid},
-                #{serviceName},#{provinceCode},#{cityCode},#{districtCode},#{requireNum},#{repertory});
+                #{serviceName},#{provinceCode},#{cityCode},#{districtCode},#{requireNum},#{repertory},#{projectCode});
     </insert>
 
     <insert id="addPublishServiceSon" parameterType="com.mmc.csf.release.entity.requirements.ServiceRequirementsSonDO"
@@ -533,12 +533,12 @@
                                       require_description, create_time,
                                       update_time, task_start_time, task_end_time, task_address, longitude,
                                       latitude, publisher_number, insurance, publish,
-                                      service_flow_id, adcode, order_level_amount, openid, service_name,province_code,city_code,district_code,father_require_id)
+                                      service_flow_id, adcode, order_level_amount, openid, service_name,province_code,city_code,district_code,father_require_id,project_code)
         VALUES (#{serviceId}, #{userAccountId}, #{publishName}, #{publishPhone},
                 #{requireDescription}, NOW(),
                 NOW(), #{taskStartTime}, #{taskEndTime}, #{taskAddress}, #{longitude},
                 #{latitude}, #{publisherNumber}, #{insurance}, 1, 1, #{adcode}, #{orderLevelAmount}, #{openid},
-                #{serviceName},#{provinceCode},#{cityCode},#{districtCode},#{fatherRequireId});
+                #{serviceName},#{provinceCode},#{cityCode},#{districtCode},#{fatherRequireId},#{projectCode});
     </insert>
 
     <insert id="addAmount" parameterType="com.mmc.csf.release.entity.requirements.RequirementsAmountDO"
@@ -1871,7 +1871,8 @@
         ri.province_code,
         ri.city_code,
         ri.district_code,
-        ri.service_flow_id
+        ri.service_flow_id,
+        ri.project_code
         FROM requirements_info ri
         LEFT JOIN requirements_amount ra
         ON ra.requirements_info_id = ri.id AND ri.user_account_id = ra.user_account_id

release-service/src/main/resources/not-check.yml

@@ -48,4 +48,5 @@ data-filter:
     - /release/curriculum/curriculumDetails
     - /release/backstage/forum/getNotCheckDynamicSum
     - /release/dynamic/dynamicList1
+    - /release/curriculum/selectCurriculumClassify