标准意见查看调整

src/main/java/com/jeeplus/modules/bzshbExamine/dao/StandardOpinionDao.java

@@ -23,6 +23,13 @@ public interface StandardOpinionDao extends CrudDao<StandardOpinion> {
     Integer getStandardNumber(StandardOpinion standardOpinion);
 
     /**
+     * 获取B级项目的数量
+     * @param standardOpinion
+     * @return
+     */
+    Integer getBjiProject(StandardOpinion standardOpinion);
+
+    /**
      * 查询指定人时间区间内项目总数
      * @param standardOpinion
      * @return
@@ -59,4 +66,15 @@ public interface StandardOpinionDao extends CrudDao<StandardOpinion> {
      * @return
      */
     Integer getProjectCountByMasterUserTwo(StandardOpinion standardOpinion);
+
+    /**
+     * 获取B级复核标准数量
+     * @return
+     */
+    Integer getBjiStandard();
+    /**
+     * 获取A级复核标准数量
+     * @return
+     */
+    Integer getAjiStandard();
 }

src/main/java/com/jeeplus/modules/bzshbExamine/entity/StandardOpinion.java

@@ -33,6 +33,7 @@ public class StandardOpinion extends DataEntity<StandardOpinion> {
 
     private String deductOption;    //标准复核意见
     private String standardDetail;  //标准内容
+    private String standardDetailTwo;  //标准内容旧数据
 
 
     public String getUserId() {
@@ -178,4 +179,12 @@ public class StandardOpinion extends DataEntity<StandardOpinion> {
     public void setStandardDetail(String standardDetail) {
         this.standardDetail = standardDetail;
     }
+
+    public String getStandardDetailTwo() {
+        return standardDetailTwo;
+    }
+
+    public void setStandardDetailTwo(String standardDetailTwo) {
+        this.standardDetailTwo = standardDetailTwo;
+    }
 }

src/main/java/com/jeeplus/modules/bzshbExamine/service/StandardOpinionService.java

@@ -49,8 +49,20 @@ public class StandardOpinionService extends CrudService<StandardOpinionDao, Stan
         if(null == standardOpinion.getEndDate()){
             standardOpinion.setEndDate(new Date());
         }
-
+        //获取AB级的质量复核数量
+        Integer AJi=dao.getAjiStandard();
+        Integer BJi=dao.getBjiStandard();
         for (StandardOpinion info: recordsList) {
+            //B级项目数量
+            Integer BCount=dao.getBjiProject(info);
+            if (null==BCount){
+                BCount=0;
+            }
+            //A级项目数量
+            Integer ACount=info.getProjectAllNumber()-BCount;
+            //获取AB级项目的总质量复核数量
+            Integer standardNumber=(ACount*AJi)+(BCount*BJi);
+            info.setStandardNumber(standardNumber);
             info.setAuditUserIdList(standardOpinion.getAuditUserIdList());
             info.setStartDate(standardOpinion.getStartDate());
             info.setEndDate(standardOpinion.getEndDate());

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectViewController.java

@@ -812,15 +812,23 @@ public class RuralProjectViewController extends BaseController {
         workReviewAudit.setType(type);
         workReviewAudit.setReportId(projectReportData.getId());
         List<WorkReviewAudit> audits = workReviewStandardService.findAuditList(workReviewAudit);
+        //判断是否是新数据
+        boolean flag=false;
         for(WorkReviewAudit reviewAudit:workReviewAudits){
             for (WorkReviewAudit audit:audits){
                 if (reviewAudit.getId().equals(audit.getStandardId())){
                     reviewAudit.setDeductOption(audit.getDeductOption());
+                    flag=true;
                     break;
                 }
             }
         }
-        model.addAttribute("list", workReviewAudits);
+        //取出旧数据的标准意见
+        if (!flag){
+            model.addAttribute("list", audits);
+        }else{
+            model.addAttribute("list", workReviewAudits);
+        }
         model.addAttribute("projectReportRecord", projectReportRecord);
         model.addAttribute("project", projectReportRecord.getReport().getProject());
         return "modules/ruralprojectrecords/view/projectReportRecordView";

src/main/resources/mappings/modules/bzshbExamin/StandardOpinionDao.xml

@@ -29,6 +29,21 @@
 		group by wpu.user_id
 		order by a.audit_pass_date desc
 	</select>
+	<select id="getBjiProject" resultType="java.lang.Integer" >
+		select count(a.create_by)
+		from project_report_data a
+		left join work_project_user wpu on wpu.project_id = a.project_id
+		left join rural_project_records rpr on rpr.id = a.project_id
+		<where>
+			and a.del_flag = 0
+			and rpr.project_id is not null
+			and a.status = 5
+			and wpu.is_master = 1
+			and rpr.submit_money =1
+			and wpu.user_id=#{userId}
+		</where>
+		group by wpu.user_id
+	</select>
 
     <select id="queryCount" resultType="int" >
         select count(1)
@@ -105,7 +120,7 @@
 			and wpu.user_id = #{userId}
 			and a.del_flag = 0 and wpu.is_master = 1 and a.status = 5
 			and wa.type=4
-			and wa.standard_id is not null
+			and (wa.deductOption IS NOT NULL and wa.deductOption !='' )
 			<if test="auditUserIdList.size>0">
 				and a.bzshb_user_id in
 				<foreach collection="auditUserIdList" item="auditUserId" separator="," open="(" close=")">
@@ -125,7 +140,7 @@
 			and wpu.user_id = #{userId}
 			and a.del_flag = 0 and wpu.is_master = 1 and a.status = 5
 			and wa.type=4
-			and wa.standard_id is not null
+			and (wa.deductOption IS NOT NULL and wa.deductOption !='' )
 			<if test="auditUserIdList.size>0">
 				and a.bzshb_user_id in
 				<foreach collection="auditUserIdList" item="auditUserId" separator="," open="(" close=")">
@@ -144,7 +159,8 @@
 		aa.projectName,
 		aa.createDate,
 		ws.standard_detail AS "standardDetail",
-		wa.deductOption AS "deductOption"
+		wa.deductOption AS "deductOption",
+		wa.standard_detail AS "standardDetailTwo"
 		FROM (
 		select a.id as "projectId" ,a.project_name as "projectName",a.create_date AS "createDate",prd.id as "reportId",wpu.user_id as "user_id",prd.bzshb_user_id as "bzshb_user_id" FROM rural_project_records a
 		LEFT JOIN work_project_user wpu ON wpu.project_id = a.id
@@ -159,7 +175,7 @@
 		<where>
 			and aa.user_id = #{userId}
 			AND wa.type = 4
-			AND wa.standard_id IS NOT NULL
+			AND (wa.deductOption IS NOT NULL and wa.deductOption !='' )
 			<if test="auditUserIdList.size>0">
 				and aa.bzshb_user_id in
 				<foreach collection="auditUserIdList" item="auditUserId" separator="," open="(" close=")">
@@ -186,7 +202,7 @@
 		<where>
 			and wpu.user_id = #{userId}
 			AND wa.type = 4
-			AND wa.standard_id IS NOT NULL
+			AND (wa.deductOption IS NOT NULL and wa.deductOption !='' )
 			<if test="auditUserIdList.size>0">
 				and prd.bzshb_user_id in
 				<foreach collection="auditUserIdList" item="auditUserId" separator="," open="(" close=")">
@@ -210,7 +226,7 @@
 		<where>
 			and wpu.user_id = #{userId}
 			AND wa.type = 4
-			AND wa.standard_id IS NOT NULL
+			AND (wa.deductOption IS NOT NULL and wa.deductOption !='' )
 			<if test="auditUserIdList.size>0">
 				and prd.bzshb_user_id in
 				<foreach collection="auditUserIdList" item="auditUserId" separator="," open="(" close=")">
@@ -225,7 +241,14 @@
 			</if>
 		</where>
 	</select>
-
+	<select id="getBjiStandard" resultType="java.lang.Integer">
+		select count(1) from work_review_standard where parent_ids like concat('0,3,','%') and
+			parent_id != '3'
+	</select>
+	<select id="getAjiStandard" resultType="java.lang.Integer">
+		select count(1) from work_review_standard where parent_ids like concat('0,1,','%') and
+			parent_id != '1'
+	</select>
 
 
 </mapper>

src/main/webapp/webpage/modules/bzshStandardOpinion/StandardOpinionAllList.jsp

@@ -265,7 +265,7 @@
 				,{field:'op',align:'center',title:"操作", fixed: 'right',width:100,templet:function(d){
 						////对操作进行初始化
 						var xml="";
-						xml+="<a href=\"#\" onclick=\"openDialogView('查看', '${ctx}/standardOpinion/standardOpinion/viewList?id=" + d.id + "&userId=" + d.userId + "','95%', '95%','','关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 查看</a>";
+						xml+="<a href=\"#\" onclick=\"openDialogView('查看', '${ctx}/standardOpinionAll/standardOpinionAll/viewList?id=" + d.id + "&userId=" + d.userId + "','95%', '95%','','关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 查看</a>";
 						return xml;
 
 					}}

src/main/webapp/webpage/modules/bzshStandardOpinion/StandardOpinionList.jsp

@@ -380,8 +380,9 @@
                 {field:'index',align:'center', fixed: 'left', title: '序号',width:40}
                 ,{field:'userName',align:'center', title: '项目责任人'}
                 ,{field:'projectAllNumber',align:'center', title: '总项目数'}
+                ,{field:'standardNumber',align:'center', title: '总评价数'}
                 ,{field:'projectAllCount',align:'center', title: '当前项目数'}
-                ,{field:'standardCount',align:'center', title: '当前标准评价数'}
+                ,{field:'standardCount',align:'center', title: '当前评价数'}
                 ,{field:'op',align:'center',title:"操作", fixed: 'right',width:100,templet:function(d){
                         ////对操作进行初始化
                         var xml="";
@@ -402,6 +403,7 @@
 					,"startDate":"<fmt:formatDate value="${bzshbExamin.startDate}" pattern="yyyy-MM-dd"/>"
 					,"endDate":"<fmt:formatDate value="${bzshbExamin.endDate}" pattern="yyyy-MM-dd"/>"
                     ,"projectAllNumber":"${bzshbExamin.projectAllNumber}"
+                    ,"standardNumber":"${bzshbExamin.standardNumber}"
                     ,"projectAllCount":"${bzshbExamin.projectAllCount}"
                     ,"standardCount":"${bzshbExamin.standardCount}"
                 }

src/main/webapp/webpage/modules/bzshStandardOpinion/StandardOpinionUserProjectList.jsp

@@ -340,7 +340,12 @@
                     ,"projectId":"${bzshbExamin.projectId}"
 					,"createDate":"<fmt:formatDate value="${bzshbExamin.createDate}" pattern="yyyy-MM-dd"/>"
                     ,"projectName":"<c:out value="${bzshbExamin.projectName}" escapeXml="true"/>"
-					,"standardDetail":"${bzshbExamin.standardDetail}"
+					<c:if test="${null == bzshbExamin.standardDetail}">
+						,"standardDetail":"${bzshbExamin.standardDetailTwo}"
+					</c:if>
+					<c:if test="${null != bzshbExamin.standardDetail}">
+						,"standardDetail":"${bzshbExamin.standardDetail}"
+					</c:if>
 					,"deductOption":"${bzshbExamin.deductOption}"
 				}
                 </c:forEach>