Merge branch 'master' of https://gitee.com/xswl_123/dite-shixi-bakcend

# Conflicts:
#	core/src/main/java/com/dite/znpt/mapper/BusinessDataMapper.java
#	core/src/main/java/com/dite/znpt/service/BusinessDataService.java
#	core/src/main/java/com/dite/znpt/service/impl/BusinessDataServiceImpl.java
#	core/src/main/resources/mapper/BusinessDataMapper.xml
#	web/src/main/java/com/dite/znpt/web/controller/BusinessDataController.java

core/src/main/java/com/dite/znpt/converts/Impl/ConvertsImpl.java

@@ -232,6 +232,9 @@ public class ConvertsImpl implements Converts {
         projectResp.setAuditorId( entity.getAuditorId() );
         projectResp.setQualityOfficerId( entity.getQualityOfficerId() );
         projectResp.setProjectManagerId( entity.getProjectManagerId() );
+        projectResp.setProjectOrigin( entity.getProjectOrigin() );
+        projectResp.setProjectBudget( entity.getProjectBudget() );
+
         if ( entity.getStatus() != null ) {
             projectResp.setStatus( entity.getStatus() );
         }
@@ -270,6 +273,8 @@ public class ConvertsImpl implements Converts {
         projectEntity.setStatus( req.getStatus() );
         projectEntity.setStartDate( req.getStartDate() );
         projectEntity.setEndDate( req.getEndDate() );
+        projectEntity.setProjectOrigin( req.getProjectOrigin() );
+        projectEntity.setProjectBudget( req.getProjectBudget() );
 
         return projectEntity;
     }

core/src/main/java/com/dite/znpt/domain/vo/ProjectListReq.java

@@ -23,6 +23,12 @@ public class ProjectListReq implements Serializable {
     @ApiModelProperty("项目名称")
     private String projectName;
 
+    @ApiModelProperty(value = "项目来源")
+    private String projectOrigin;
+
+    @ApiModelProperty(value = "项目预算")
+    private Integer projectBudget;
+
     @ApiModelProperty("风场名称")
     private String farmName;
 

core/src/main/java/com/dite/znpt/domain/vo/ProjectListResp.java

@@ -31,6 +31,12 @@ public class ProjectListResp implements Serializable {
     @ApiModelProperty("项目名称")
     private String projectName;
 
+    @ApiModelProperty(value = "项目来源")
+    private String projectOrigin;
+
+    @ApiModelProperty(value = "项目预算")
+    private Integer projectBudget;
+
     @ApiModelProperty("风场名称")
     private String farmName;
 

core/src/main/java/com/dite/znpt/domain/vo/ProjectReq.java

@@ -28,6 +28,14 @@ public class ProjectReq implements Serializable {
     @ApiModelProperty("项目id")
     private String projectId;
 
+    @NotBlank(groups = {ValidationGroup.Insert.class, ValidationGroup.Update.class}, message = "项目来源不能为空")
+    @ApiModelProperty("项目来源")
+    private String projectOrigin;
+
+    @NotBlank(groups = {ValidationGroup.Insert.class, ValidationGroup.Update.class}, message = "项目预算不能为空")
+    @ApiModelProperty("项目预算")
+    private Integer projectBudget;
+
     @NotBlank(groups = {ValidationGroup.Insert.class, ValidationGroup.Update.class}, message = "项目名称不能为空")
     @Size(groups = {ValidationGroup.Insert.class, ValidationGroup.Update.class}, max = 50, message = "项目名称长度不能超过50字符")
     @ApiModelProperty("项目名称")

core/src/main/java/com/dite/znpt/domain/vo/ProjectResp.java

@@ -27,6 +27,15 @@ public class ProjectResp extends ProjectReq implements Serializable {
     @Serial
     private static final long serialVersionUID = -1883901559600186726L;
 
+    @ApiModelProperty("项目ID")
+    private String projectId;
+
+    @ApiModelProperty("项目来源")
+    private String projectOrigin;
+
+    @ApiModelProperty("项目预算")
+    private Integer projectBudget;
+
     @ApiModelProperty("施工人员")
     private String constructorName;
 

core/src/main/resources/mapper/ProjectMapper.xml

@@ -3,17 +3,17 @@
 <mapper namespace="com.dite.znpt.mapper.ProjectMapper">
     <select id="queryBySelective" resultType="com.dite.znpt.domain.vo.ProjectListResp">
         with taskProgress as (
-             SELECT
+        SELECT
-                 count(1) task_count,
+        count(1) task_count,
-                 sum(status=0) taskPendingCount,
+        sum(status=0) taskPendingCount,
-                 sum(status=1) task_progress_count,
+        sum(status=1) task_progress_count,
-                 sum(status=2) task_complete_count,
+        sum(status=2) task_complete_count,
-                 project_id
+        project_id
-             FROM project_task
+        FROM project_task
-             group by project_id
+        group by project_id
         )
         SELECT
-        prj.project_id, prj.project_name, prj.farm_name, prj.status, prj.cover_url, prj.farm_address, prj.client, prj.client_contact, prj.client_phone, prj.inspection_unit,
+        prj.project_id, prj.project_origin, prj.project_budget, prj.project_name, prj.farm_name, prj.status, prj.cover_url, prj.farm_address, prj.client, prj.client_contact, prj.client_phone, prj.inspection_unit,
         prj.inspection_contact, prj.inspection_phone, prj.scale, prj.turbine_model, prj.project_manager_id, pm.name AS project_manager_name, prj.constructor_ids,
         GROUP_CONCAT(DISTINCT con.name) AS constructor_name, prj.start_date, prj.end_date, tp.taskPendingCount, tp.task_progress_count, tp.task_complete_count, tp.task_count
         FROM project prj