Merge branch 'master' of http://192.168.101.10:13000/gogs/zhaoshangyinzi

ruoyi-system/src/main/java/com/ruoyi/system/domain/project/BmProjectConstruction.java

@@ -50,34 +50,6 @@ public class BmProjectConstruction extends BaseEntity
     @Excel(name = "开工照片")
     private String constructionPhoto;
 
-    /**
-     * 合同约定开工时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date orderBeginTime;
-
-    /**
-     * 合同约定竣工时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date orderEndTime;
-
-    public Date getOrderBeginTime() {
-        return orderBeginTime;
-    }
-
-    public void setOrderBeginTime(Date orderBeginTime) {
-        this.orderBeginTime = orderBeginTime;
-    }
-
-    public Date getOrderEndTime() {
-        return orderEndTime;
-    }
-
-    public void setOrderEndTime(Date orderEndTime) {
-        this.orderEndTime = orderEndTime;
-    }
-
     public void setId(Long id)
     {
         this.id = id;

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/project/BmProjectServiceImpl.java

@@ -255,6 +255,11 @@ public class BmProjectServiceImpl implements IBmProjectService {
             }
             //判断是否是提交审核/通过审核
             projectStatus = (code & 1) == 1 ? projectStatus + EXAMINE_COMMIT : projectStatus - EXAMINE_COMMIT;
+
+            //判断如果是撤销审核需要在减一
+            if (code.equals(EXAMINE_FOUR)){
+                projectStatus = projectStatus - EXAMINE_COMMIT;
+            }
             if (projectStatus < EXAMINE_COMMIT) {
                 projectStatus = EXAMINE_COMMIT;
             }

ruoyi-system/src/main/resources/mapper/system/project/BmConstructionPayMapper.xml

@@ -107,10 +107,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
         sys_dept d
         LEFT JOIN bm_project p ON d.dept_id = p.dept_id
-        AND d.del_flag = '0'
         LEFT JOIN bm_construction_pay cp ON p.id = cp.bm_project_id and p.is_del = '0' and year(cp.create_time) = #{year}
+        where d.del_flag = '0'
         GROUP BY d.dept_id
-
+        order by payForMoney DESC
     </select>
 
 

ruoyi-system/src/main/resources/mapper/system/project/BmDeptPlanMapper.xml

@@ -112,22 +112,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectUnitList"  resultType="com.ruoyi.system.domain.vo.BmDeptPlanVo">
     SELECT
-	ifnull(s1.dept_name,'') AS deptName,
-	ifnull(s1.plan,0) AS targetInvestmentNum,
-	ifnull(count( p.id ),0) AS successMission
+	ifnull( s1.dept_name, '' ) AS deptName,
+	ifnull( s1.plan, 0 ) AS targetInvestmentNum,
+	ifnull( count( p.id ), 0 ) AS successMission
     FROM
 	(
 	SELECT
+		sd.dept_id,
 		sd.dept_name,
 		d.sys_dept_id,
 		d.plan
 	FROM
-	    sys_dept sd
-		LEFT JOIN `bm_dept_plan` d ON d.sys_dept_id = sd.dept_id and d.is_del = '0' and sd.del_flag = '0'
+		sys_dept sd
+		LEFT JOIN `bm_dept_plan` d ON d.sys_dept_id = sd.dept_id
+		AND d.is_del = '0'
+	WHERE
+		sd.del_flag = '0'
 	) s1
-	LEFT JOIN bm_project p ON p.dept_id = s1.sys_dept_id and p.is_del = '0'
+	LEFT JOIN bm_project p ON p.dept_id = s1.sys_dept_id
+	AND p.is_del = '0'
     GROUP BY
-	s1.sys_dept_id
+	s1.dept_id
     ORDER BY
 	successMission DESC,
 	targetInvestmentNum DESC
@@ -140,7 +145,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	ifnull(s1.payForMoney,0) as payForMoney
     FROM
     sys_dept sd
-	LEFT JOIN `bm_dept_plan` d ON d.sys_dept_id = sd.dept_id and sd.del_flag = '0'
+	LEFT JOIN `bm_dept_plan` d ON d.sys_dept_id = sd.dept_id
 	AND d.is_del = '0'
 	LEFT JOIN (
 	SELECT
@@ -159,6 +164,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	GROUP BY
 		s.dept_id
 	) s1 ON s1.dept_id = d.sys_dept_id
+	where sd.del_flag = '0'
     ORDER BY
 	s1.payForMoney DESC,
 	d.target_arrival_amount DESC
@@ -166,22 +172,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectUnitClueList"  resultType="com.ruoyi.system.domain.vo.BmDeptPlanVo">
     SELECT
-	ifnull(s1.dept_name,'') AS deptName,
-	ifnull(s1.plan,0) AS plan,
-	ifnull(count( p.id ),0) AS successMission
+	ifnull( s1.dept_name, '' ) AS deptName,
+	ifnull( s1.plan, 0 ) AS plan,
+	ifnull( count( p.id ), 0 ) AS successMission
     FROM
 	(
 	SELECT
+		sd.dept_id,
 		sd.dept_name,
 		d.sys_dept_id,
 		d.plan
 	FROM
-	    sys_dept sd
-		LEFT JOIN `bm_dept_plan` d ON d.sys_dept_id = sd.dept_id and d.is_del = '0' and sd.del_flag = '0'
+		sys_dept sd
+		LEFT JOIN `bm_dept_plan` d ON d.sys_dept_id = sd.dept_id
+		AND d.is_del = '0'
+	WHERE
+		sd.del_flag = '0'
 	) s1
-	LEFT JOIN bm_project p ON p.dept_id = s1.sys_dept_id and p.is_del = '0'
+	LEFT JOIN bm_project p ON p.dept_id = s1.sys_dept_id
+	AND p.is_del = '0'
     GROUP BY
-	s1.sys_dept_id
+	s1.dept_id
     ORDER BY
 	successMission DESC,
 	plan DESC
@@ -195,16 +206,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     FROM
 	(
 	SELECT
+	    sd.dept_id,
 		sd.dept_name,
 		d.sys_dept_id,
 		d.target_signing_num
 	FROM
 	    sys_dept sd
-		LEFT JOIN `bm_dept_plan` d ON d.sys_dept_id = sd.dept_id and d.is_del = '0' and sd.del_flag = '0'
+		LEFT JOIN `bm_dept_plan` d ON d.sys_dept_id = sd.dept_id and d.is_del = '0'
+		where sd.del_flag = '0'
 	) s1
 	LEFT JOIN bm_project p ON p.dept_id = s1.sys_dept_id and p.is_del = '0' and p.project_status &gt; 4
     GROUP BY
-	s1.sys_dept_id
+	s1.dept_id
     ORDER BY
 	successMission DESC,
 	targetSigningNum DESC
@@ -212,15 +225,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTotAmtList"  resultType="com.ruoyi.system.domain.vo.BmDeptPlanVo">
     SELECT
-	d.dept_name as deptName,
-	ifnull(dp.target_contract_amount,0) as targetContractAmount,
-	ifnull(p.tot_amt,0) as totAmt
+	d.dept_name AS deptName,
+	ifnull( dp.target_contract_amount, 0 ) AS targetContractAmount,
+	ifnull( p.tot_amt, 0 ) AS totAmt
     FROM
 	sys_dept d
 	LEFT JOIN bm_project p ON p.dept_id = d.dept_id
-	AND d.del_flag = '0' and p.is_del = '0'
+	AND p.is_del = '0'
 	LEFT JOIN bm_dept_plan dp ON dp.sys_dept_id = d.dept_id
-	GROUP BY d.dept_id
+    WHERE
+	d.del_flag = '0'
+    GROUP BY
+	d.dept_id
+    ORDER BY
+	targetContractAmount DESC,
+	totAmt DESC
     </select>
 
 
@@ -231,7 +250,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     FROM
 	sys_dept sd
 	LEFT JOIN `bm_dept_plan` d ON d.sys_dept_id = sd.dept_id
-	AND sd.del_flag = '0'
 	AND d.is_del = '0'
 	LEFT JOIN (
 	SELECT
@@ -250,6 +268,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	GROUP BY
 		s.dept_id
 	) s1 ON s1.dept_id = d.sys_dept_id
+	WHERE
+	sd.del_flag = '0'
     ORDER BY
 	s1.payForMoney DESC
     </select>
@@ -263,8 +283,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     FROM
 	sys_dept d
 	LEFT JOIN bm_project p ON p.dept_id = d.dept_id
-	AND d.del_flag = '0' and p.is_del = '0' and p.project_status &gt; 8
+	and p.is_del = '0' and p.project_status &gt; 8
 	LEFT JOIN bm_dept_plan dp ON dp.sys_dept_id = d.dept_id
+	where d.del_flag = '0'
     GROUP BY
 	d.dept_id
 	order by successMission DESC,
@@ -280,9 +301,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     FROM
 	sys_dept d
 	LEFT JOIN bm_project p ON p.dept_id = d.dept_id
-	AND d.del_flag = '0' and p.is_del = '0' and p.project_status &gt; 8 and year(p.create_time) = #{year}
+	and p.is_del = '0' and p.project_status &gt; 8 and year(p.create_time) = #{year}
 	LEFT JOIN bm_dept_plan dp ON dp.sys_dept_id = d.dept_id
+	where d.del_flag = '0'
     GROUP BY
 	d.dept_id
+	ORDER BY successMission
     </select>
 </mapper>

ruoyi-system/src/main/resources/mapper/system/project/BmProjectConstructionMapper.xml

@@ -41,9 +41,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     
     <select id="selectBmProjectConstructionById" parameterType="Long" resultMap="BmProjectConstructionResult">
-      select c.id, c.bm_project_id, c.create_by, c.create_time, c.update_by, c.update_time, c.is_del, c.construction_code, c.is_construction, c.construction_startdate, c.construction_enddate, c.construction_doc, c.construction_photo, p.order_begin_time, p.order_end_time
+      select c.id, c.bm_project_id, c.create_by, c.create_time, c.update_by, c.update_time, c.is_del, c.construction_code, c.is_construction, c.construction_startdate, c.construction_enddate, c.construction_doc, c.construction_photo
       from bm_project_construction c
-      left join bm_project p on c.bm_project_id = p.id and p.is_del = '0'
       where c.bm_project_id = #{id} limit 1
     </select>
         

ruoyi-system/src/main/resources/mapper/system/project/BmProjectMapper.xml

@@ -221,10 +221,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     FROM
 	sys_dept d
 	LEFT JOIN bm_project p ON d.dept_id = p.dept_id
-	AND d.del_flag = '0' and d.status = '0' and p.project_status in (1,2,3,4) and p.is_del = '0'
+	and d.status = '0' and p.project_status in (1,2,3,4) and p.is_del = '0'
 	AND YEAR (p.create_time ) = #{year}
+	where d.del_flag = '0'
     GROUP BY
 	d.dept_id
+	order by successMission DESC
     </select>
 
 
@@ -236,12 +238,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     FROM
 	sys_dept d
 	LEFT JOIN bm_project p ON d.dept_id = p.dept_id
-	AND d.del_flag = '0'
-	AND d.status = '0'
 	AND p.project_status &gt; 4
 	AND p.is_del = '0'
 	AND YEAR ( p.create_time ) = #{year}
+	where d.del_flag = '0'
     GROUP BY
 	d.dept_id
+	order by successMission DESC,
+	totAmt DESC
     </select>
 </mapper>

ruoyi-ui/src/views/management/nstruction/index.vue

@@ -1339,6 +1339,7 @@ export default {
               this.msgSuccess("新增成功");
               this.openther = false;
               this.getListfour();
+              this.getListfive()
             });
           }
         });