修改

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/modules/deductiondetails/entity/EvaluationSummary.java

@@ -1,5 +1,6 @@
 package com.jeeplus.modules.deductiondetails.entity;
 
+import com.jeeplus.common.utils.excel.annotation.ExcelField;
 import com.jeeplus.core.persistence.DataEntity;
 
 public class EvaluationSummary extends DataEntity<EvaluationSummary> {
@@ -14,6 +15,7 @@ public class EvaluationSummary extends DataEntity<EvaluationSummary> {
     private String veto; //是否存在否决事项
     private String sumScore; //汇总评分
 
+    @ExcelField(title="施工单位年代", align=2, sort=1)
     public String getYearOfEvaluation() {
         return yearOfEvaluation;
     }
@@ -22,6 +24,7 @@ public class EvaluationSummary extends DataEntity<EvaluationSummary> {
         this.yearOfEvaluation = yearOfEvaluation;
     }
 
+    @ExcelField(title="施工单位名称", align=2, sort=2)
     public String getEvaName() {
         return evaName;
     }
@@ -30,6 +33,7 @@ public class EvaluationSummary extends DataEntity<EvaluationSummary> {
         this.evaName = evaName;
     }
 
+    @ExcelField(title="现场安全管控评价", align=2, sort=3)
     public String getSafetyEva() {
         return safetyEva;
     }
@@ -38,6 +42,7 @@ public class EvaluationSummary extends DataEntity<EvaluationSummary> {
         this.safetyEva = safetyEva;
     }
 
+    @ExcelField(title="现场施工质量及进度评价", align=2, sort=4)
     public String getProgressEva() {
         return progressEva;
     }
@@ -46,6 +51,7 @@ public class EvaluationSummary extends DataEntity<EvaluationSummary> {
         this.progressEva = progressEva;
     }
 
+    @ExcelField(title="造价及竣工资料评价", align=2, sort=5)
     public String getCostEva() {
         return costEva;
     }
@@ -54,6 +60,7 @@ public class EvaluationSummary extends DataEntity<EvaluationSummary> {
         this.costEva = costEva;
     }
 
+    @ExcelField(title="优质服务及文明施工评价", align=2, sort=6)
     public String getQualityEva() {
         return qualityEva;
     }
@@ -62,6 +69,7 @@ public class EvaluationSummary extends DataEntity<EvaluationSummary> {
         this.qualityEva = qualityEva;
     }
 
+    @ExcelField(title="其他加减分评价", align=2, sort=7)
     public String getPointsEva() {
         return pointsEva;
     }
@@ -70,6 +78,7 @@ public class EvaluationSummary extends DataEntity<EvaluationSummary> {
         this.pointsEva = pointsEva;
     }
 
+    @ExcelField(title="是否存在否决事项", align=2, sort=8)
     public String getVeto() {
         return veto;
     }
@@ -78,6 +87,7 @@ public class EvaluationSummary extends DataEntity<EvaluationSummary> {
         this.veto = veto;
     }
 
+    @ExcelField(title="汇总评分", align=2, sort=9)
     public String getSumScore() {
         return sumScore;
     }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/modules/deductiondetails/web/DeductionDetailsController.java

@@ -176,14 +176,14 @@ public class DeductionDetailsController extends BaseController {
 	 */
 	@RequiresPermissions("deductiondetails:deductionDetails:export")
     @GetMapping("export")
-    public AjaxJson exportFile(DeductionDetails deductionDetails, HttpServletRequest request, HttpServletResponse response) {
+    public AjaxJson exportFile(EvaluationSummary evaluationSummary, HttpServletRequest request, HttpServletResponse response) {
 		try {
-            String fileName = "扣分详情"+DateUtils.getDate("yyyyMMddHHmmss")+".xlsx";
-            Page<DeductionDetails> page = deductionDetailsService.findPage(new Page<DeductionDetails>(request, response, -1), deductionDetails);
-    		new ExportExcel("扣分详情", DeductionDetails.class).setDataList(page.getList()).write(response, fileName).dispose();
+            String fileName = "评分汇总"+DateUtils.getDate("yyyyMMddHHmmss")+".xlsx";
+            Page<EvaluationSummary> page = deductionDetailsService.findSummeryPage(new Page<EvaluationSummary>(request, response, -1), evaluationSummary);
+    		new ExportExcel("评分汇总", EvaluationSummary.class).setDataList(page.getList()).write(response, fileName).dispose();
     		return null;
 		} catch (Exception e) {
-			return AjaxJson.error("导出扣分详情记录失败！失败信息："+e.getMessage());
+			return AjaxJson.error("导出评分汇总记录失败！失败信息："+e.getMessage());
 		}
     }
 

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/modules/deductionshowdetails/entity/DeductionShowDetails.java

@@ -36,7 +36,6 @@ public class DeductionShowDetails extends DataEntity<DeductionShowDetails> {
 		super(id);
 	}
 
-	@ExcelField(title="施工单位Id", align=2, sort=1)
 	public String getUnitId() {
 		return unitId;
 	}
@@ -45,7 +44,6 @@ public class DeductionShowDetails extends DataEntity<DeductionShowDetails> {
 		this.unitId = unitId;
 	}
 	
-	@ExcelField(title="大类Id", align=2, sort=2)
 	public String getClassId() {
 		return classId;
 	}
@@ -54,7 +52,6 @@ public class DeductionShowDetails extends DataEntity<DeductionShowDetails> {
 		this.classId = classId;
 	}
 	
-	@ExcelField(title="小类Id", align=2, sort=3)
 	public String getSubClassId() {
 		return subClassId;
 	}
@@ -63,7 +60,7 @@ public class DeductionShowDetails extends DataEntity<DeductionShowDetails> {
 		this.subClassId = subClassId;
 	}
 	
-	@ExcelField(title="年份", align=2, sort=4)
+	@ExcelField(title="年份", align=2, sort=1)
 	public String getYearOfEvaluation() {
 		return yearOfEvaluation;
 	}
@@ -72,7 +69,7 @@ public class DeductionShowDetails extends DataEntity<DeductionShowDetails> {
 		this.yearOfEvaluation = yearOfEvaluation;
 	}
 	
-	@ExcelField(title="名称", align=2, sort=5)
+	@ExcelField(title="名称", align=2, sort=2)
 	public String getUnitName() {
 		return unitName;
 	}
@@ -81,7 +78,7 @@ public class DeductionShowDetails extends DataEntity<DeductionShowDetails> {
 		this.unitName = unitName;
 	}
 	
-	@ExcelField(title="大类名称", align=2, sort=6)
+	@ExcelField(title="大类名称", align=2, sort=3)
 	public String getBigName() {
 		return bigName;
 	}
@@ -90,7 +87,7 @@ public class DeductionShowDetails extends DataEntity<DeductionShowDetails> {
 		this.bigName = bigName;
 	}
 	
-	@ExcelField(title="小类序号", align=2, sort=7)
+	@ExcelField(title="小类序号", align=2, sort=4)
 	public String getSerialNumber() {
 		return serialNumber;
 	}
@@ -99,7 +96,7 @@ public class DeductionShowDetails extends DataEntity<DeductionShowDetails> {
 		this.serialNumber = serialNumber;
 	}
 	
-	@ExcelField(title="小类名称", align=2, sort=8)
+	@ExcelField(title="小类名称", align=2, sort=5)
 	public String getSmallName() {
 		return smallName;
 	}
@@ -108,7 +105,7 @@ public class DeductionShowDetails extends DataEntity<DeductionShowDetails> {
 		this.smallName = smallName;
 	}
 	
-	@ExcelField(title="扣分分数", align=2, sort=9)
+	@ExcelField(title="扣分分数", align=2, sort=6)
 	public String getDeductPoints() {
 		return deductPoints;
 	}
@@ -117,7 +114,7 @@ public class DeductionShowDetails extends DataEntity<DeductionShowDetails> {
 		this.deductPoints = deductPoints;
 	}
 	
-	@ExcelField(title="扣分详情", align=2, sort=10)
+	@ExcelField(title="扣分详情", align=2, sort=7)
 	public String getDeductionDetails() {
 		return deductionDetails;
 	}
@@ -126,7 +123,7 @@ public class DeductionShowDetails extends DataEntity<DeductionShowDetails> {
 		this.deductionDetails = deductionDetails;
 	}
 	
-	@ExcelField(title="扣分日期", align=2, sort=11)
+	@ExcelField(title="扣分日期", align=2, sort=8)
 	public String getDeductionDate() {
 		return deductionDate;
 	}
@@ -135,7 +132,7 @@ public class DeductionShowDetails extends DataEntity<DeductionShowDetails> {
 		this.deductionDate = deductionDate;
 	}
 	
-	@ExcelField(title="是否否决", dictType="", align=2, sort=12)
+	@ExcelField(title="是否否决", align=2, sort=9)
 	public String getVeto() {
 		return veto;
 	}

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/modules/deductionshowdetails/mapper/xml/DeductionShowDetailsMapper.xml

@@ -81,22 +81,22 @@
 		<where>
 			a.del_flag = #{DEL_FLAG_NORMAL}
 			${dataScope}
-			<if test="id!=null and id!=''">
+			<if test="id!=null and id!='' and id!='undefined'">
 				and a.id = #{id}
 			</if>
-			<if test="unitId!=null and unitId!=''">
+			<if test="unitId!=null and unitId!='' and unitId!='undefined'">
 				and a.unitId = #{unitId}
 			</if>
-			<if test="classId!=null and classId!=''">
+			<if test="classId!=null and classId!='' and classId!='undefined'">
 				and a.classId = #{classId}
 			</if>
-			<if test="subClassId!=null and subClassId!=''">
+			<if test="subClassId!=null and subClassId!='' and subClassId!='undefined'">
 				and a.subClassId = #{subClassId}
 			</if>
-			<if test="yearOfEvaluation!=null and yearOfEvaluation !=''">
+			<if test="yearOfEvaluation!=null and yearOfEvaluation !='' and yearOfEvaluation!='undefined'">
 				and b.yearOfEvaluation = #{yearOfEvaluation}
 			</if>
-			<if test="unitName!=null and unitName!=''">
+			<if test="unitName!=null and unitName!='' and unitName!='undefined'">
 				AND b.unitName LIKE
 				<if test="_databaseId == 'postgre'">'%'||#{unitName}||'%'</if>
 				<if test="_databaseId == 'oracle'">'%'||#{unitName}||'%'</if>
@@ -444,6 +444,7 @@
 			a.id AS "id",
 			a.yearofevaluation,
 			a.unitname,
+			0 as "basicScore",
 			(case when ( SELECT sum( deductpoints ) FROM deduction_details WHERE unitid = @id AND subclassid = '324d659b184b40068f9524848729070f' GROUP BY unitid ) is not null then ( SELECT sum( deductpoints ) FROM deduction_details WHERE unitid = @id AND subclassid = '324d659b184b40068f9524848729070f' GROUP BY unitid ) else 0 end ) AS reasonOne,
 			(case when ( SELECT sum( deductpoints ) FROM deduction_details WHERE unitid = @id AND subclassid = '2da85bc46a474f5fabab19a456b3f09c' GROUP BY unitid ) is not null then ( SELECT sum( deductpoints ) FROM deduction_details WHERE unitid = @id AND subclassid = '2da85bc46a474f5fabab19a456b3f09c' GROUP BY unitid ) else 0 end ) AS reasonTwo,
 			(case when ( SELECT sum( deductpoints ) FROM deduction_details WHERE unitid = @id AND subclassid = '6f3134f09f404a0db5c7f3ccf9830993' GROUP BY unitid ) is not null then ( SELECT sum( deductpoints ) FROM deduction_details WHERE unitid = @id AND subclassid = '6f3134f09f404a0db5c7f3ccf9830993' GROUP BY unitid ) else 0 end ) AS reasonThree,