bug修复

airport-ledger/src/main/java/com/sundot/airport/ledger/domain/LedgerSupervisionProblem.java

@@ -40,7 +40,7 @@ public class LedgerSupervisionProblem extends BaseEntity {
     private Long areaId;
 
     @Excel(name = "巡查人员")
-    private String patrolPersonnel;
+    private String inspectorName;
 
     @Excel(name = "责任人")
     private String inspectedName;
@@ -132,8 +132,8 @@ public class LedgerSupervisionProblem extends BaseEntity {
     public Long getAreaId() { return areaId; }
     public void setAreaId(Long areaId) { this.areaId = areaId; }
 
-    public String getPatrolPersonnel() { return patrolPersonnel; }
-    public void setPatrolPersonnel(String patrolPersonnel) { this.patrolPersonnel = patrolPersonnel; }
+    public String getInspectorName() { return inspectorName; }
+    public void setInspectorName(String inspectorName) { this.inspectorName = inspectorName; }
 
     public String getInspectedName() { return inspectedName; }
     public void setInspectedName(String inspectedName) { this.inspectedName = inspectedName; }

airport-ledger/src/main/java/com/sundot/airport/ledger/service/impl/LedgerCombinedImportServiceImpl.java

@@ -103,7 +103,6 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
     // ════════════════════════════════════════════════════════════════
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public Map<String, String> importAll(MultipartFile file, String batchNo, String username) throws Exception {
         Map<String, String> result = new LinkedHashMap<>();
         try (Workbook wb = WorkbookFactory.create(file.getInputStream())) {
@@ -186,7 +185,7 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
             o.setEvidenceFile(str(c, 10));      // 附件
             o.setRectificationStatus(str(c, 11)); // 整改情况
             o.setRectificationEvidence(str(c, 12)); // 整改佐证材料
-            o.setPatrolPersonnel(str(c, 13));    // 巡查人员
+            o.setInspectorName(str(c, 13));    // 巡查人员
 
             // 根据责任人名称查找组织ID和名称
             if (inspectedName != null && !inspectedName.trim().isEmpty()) {

airport-ledger/src/main/resources/mapper/ledger/LedgerSupervisionProblemMapper.xml

@@ -12,7 +12,7 @@
         <result property="groupName"              column="group_name"       />
         <result property="groupId"                column="group_id"         />
         <result property="areaId"                 column="area_id"          />
-        <result property="patrolPersonnel"        column="inspector_name"   />
+        <result property="inspectorName"          column="inspector_name"   />
         <result property="inspectedName"          column="inspected_name"   />
         <result property="inspectedId"            column="inspected_id"     />
         <result property="problemType"            column="problem_type"     />

airport-ledger/src/main/resources/mapper/ledger/LedgerWarningMapper.xml

@@ -121,10 +121,10 @@
         <if test="groupId != null">and group_id = #{groupId}</if>
         <if test="userId != null">and person_id = #{userId}</if>
         <if test="startDate != null">
-            and approve_date >= #{startDate}
+            and score_date >= #{startDate}
         </if>
         <if test="endDate != null">
-            and approve_date <![CDATA[ < ]]> date_add(#{endDate} , interval 1 day)
+            and score_date <![CDATA[ < ]]> date_add(#{endDate} , interval 1 day)
         </if>
     </select>
 
@@ -199,4 +199,4 @@
         <!--        </if>-->
     </select>
 
-</mapper>
+</mapper>