Переглянути джерело

ledger_service_patrol字段删除和调整、相关代码调整、一键导入功能导入模版调整调整

wangxx 2 тижнів тому
батько
коміт
83971c6863

+ 2 - 3
airport-admin/src/main/java/com/sundot/airport/web/controller/ledger/LedgerTemplateController.java

@@ -64,9 +64,8 @@ public class LedgerTemplateController extends BaseController {
64 64
         nm.put("servicePatrol", "服务巡查");
65 65
         hm.put("servicePatrol", 2);
66 66
         cm.put("servicePatrol", new String[]{
67
-            "时间","区域","工作点","岗位","责任人","问题描述","问题类型","整改措施","班组","问题层级",
68
-            "队室服务联络人","服务推送队室负责人","附件","整改情况","佐证材料","本月内发生问题次数",
69
-            "上月服务问题超三次人员","检查人员","分管服务经理","发送至相关人员","队室内勤","队室负责人"
67
+            "时间","区域","工作点","岗位","责任人","问题描述","问题类型","整改措施","问题层级",
68
+            "附件","整改情况","佐证材料","检查人员"
70 69
         });
71 70
 
72 71
         // 5. 投诉情况 (13列)

+ 82 - 137
airport-ledger/src/main/java/com/sundot/airport/ledger/domain/LedgerServicePatrol.java

@@ -21,36 +21,64 @@ public class LedgerServicePatrol extends BaseEntity {
21 21
     private Long id;
22 22
 
23 23
     @JsonFormat(pattern = "yyyy-MM-dd")
24
-    @Excel(name = "巡查日期", width = 20, dateFormat = "yyyy-MM-dd")
24
+    @Excel(name = "时间", width = 20, dateFormat = "yyyy-MM-dd")
25 25
     private Date recordDate;
26 26
 
27 27
     @Excel(name = "部门名称")
28 28
     private String deptName;
29 29
 
30
-    @Excel(name = "队室/班组")
30
+    private Long deptId;
31
+
31 32
     private String teamName;
32 33
 
33
-    @Excel(name = "小组")
34
+    private Long teamId;
35
+
34 36
     private String groupName;
35 37
 
36
-    @Excel(name = "巡查人")
37
-    private String inspectorName;
38
+    private Long groupId;
38 39
 
39
-    @Excel(name = "被查人")
40
+    private Long areaId;
41
+
42
+    @Excel(name = "区域")
43
+    private String location;
44
+
45
+    @Excel(name = "工作点")
46
+    private String channelNo;
47
+
48
+    @Excel(name = "岗位")
49
+    private String position;
50
+
51
+    private Long positionId;
52
+
53
+    @Excel(name = "责任人")
40 54
     private String inspectedName;
41 55
 
42
-    @Excel(name = "服务类型")
43
-    private String serviceType;
56
+    private Long inspectedId;
44 57
 
45 58
     @Excel(name = "问题描述")
46 59
     private String problemDesc;
47 60
 
48
-    @Excel(name = "巡查地点")
49
-    private String location;
61
+    @Excel(name = "问题类型")
62
+    private String serviceType;
50 63
 
51
-    @Excel(name = "处理结果")
64
+    @Excel(name = "整改措施")
52 65
     private String resultHandling;
53 66
 
67
+    @Excel(name = "问题层级")
68
+    private String problemLevel;
69
+
70
+    @Excel(name = "附件")
71
+    private String evidenceFile;
72
+
73
+    @Excel(name = "整改情况")
74
+    private String rectificationStatus;
75
+
76
+    @Excel(name = "佐证材料")
77
+    private String evidenceMaterial;
78
+
79
+    @Excel(name = "检查人员")
80
+    private String checkPersonnel;
81
+
54 82
     @Excel(name = "扣分")
55 83
     private BigDecimal deductScore;
56 84
 
@@ -63,12 +91,6 @@ public class LedgerServicePatrol extends BaseEntity {
63 91
     @Excel(name = "评分指标")
64 92
     private String scoreIndicator;
65 93
 
66
-    @Excel(name = "佐证附件")
67
-    private String evidenceFile;
68
-
69
-    @Excel(name = "备注")
70
-    private String remark;
71
-
72 94
     private String importBatch;
73 95
 
74 96
     @Excel(name = "数据来源")
@@ -77,54 +99,6 @@ public class LedgerServicePatrol extends BaseEntity {
77 99
     @Excel(name = "同步标志(0=未同步;1=已同步)")
78 100
     private String syncFlag;
79 101
 
80
-    // ========== 新增字段 ==========
81
-    @Excel(name = "工作点")
82
-    private String channelNo;
83
-
84
-    @Excel(name = "岗位")
85
-    private String position;
86
-
87
-    @Excel(name = "问题层级")
88
-    private String problemLevel;
89
-
90
-    @Excel(name = "队室服务联络人")
91
-    private String serviceContactPerson;
92
-
93
-    @Excel(name = "服务推送队室负责人")
94
-    private String servicePushLeader;
95
-
96
-    @Excel(name = "整改情况")
97
-    private String rectificationStatus;
98
-
99
-    @Excel(name = "佐证材料")
100
-    private String evidenceMaterial;
101
-
102
-    @Excel(name = "发送至相关人员")
103
-    private String sendToRelevant;
104
-
105
-    @Excel(name = "本月内发生问题次数")
106
-    private Integer monthlyProblemCount;
107
-
108
-    @Excel(name = "检查人员")
109
-    private String checkPersonnel;
110
-
111
-    @Excel(name = "分管服务经理")
112
-    private String manageServiceManager;
113
-
114
-    @Excel(name = "队室内勤")
115
-    private String teamInternalDuty;
116
-
117
-    @Excel(name = "队室负责人")
118
-    private String teamLeader;
119
-
120
-    // ========== ID字段 ==========
121
-    private Long inspectedId;
122
-    private Long deptId;
123
-    private Long teamId;
124
-    private Long groupId;
125
-    private Long positionId;
126
-    private Long areaId;
127
-
128 102
     public Long getId() { return id; }
129 103
     public void setId(Long id) { this.id = id; }
130 104
 
@@ -134,72 +108,56 @@ public class LedgerServicePatrol extends BaseEntity {
134 108
     public String getDeptName() { return deptName; }
135 109
     public void setDeptName(String deptName) { this.deptName = deptName; }
136 110
 
111
+    public Long getDeptId() { return deptId; }
112
+    public void setDeptId(Long deptId) { this.deptId = deptId; }
113
+
137 114
     public String getTeamName() { return teamName; }
138 115
     public void setTeamName(String teamName) { this.teamName = teamName; }
139 116
 
117
+    public Long getTeamId() { return teamId; }
118
+    public void setTeamId(Long teamId) { this.teamId = teamId; }
119
+
140 120
     public String getGroupName() { return groupName; }
141 121
     public void setGroupName(String groupName) { this.groupName = groupName; }
142 122
 
143
-    public String getInspectorName() { return inspectorName; }
144
-    public void setInspectorName(String inspectorName) { this.inspectorName = inspectorName; }
145
-
146
-    public String getInspectedName() { return inspectedName; }
147
-    public void setInspectedName(String inspectedName) { this.inspectedName = inspectedName; }
148
-
149
-    public String getServiceType() { return serviceType; }
150
-    public void setServiceType(String serviceType) { this.serviceType = serviceType; }
123
+    public Long getGroupId() { return groupId; }
124
+    public void setGroupId(Long groupId) { this.groupId = groupId; }
151 125
 
152
-    public String getProblemDesc() { return problemDesc; }
153
-    public void setProblemDesc(String problemDesc) { this.problemDesc = problemDesc; }
126
+    public Long getAreaId() { return areaId; }
127
+    public void setAreaId(Long areaId) { this.areaId = areaId; }
154 128
 
155 129
     public String getLocation() { return location; }
156 130
     public void setLocation(String location) { this.location = location; }
157 131
 
158
-    public String getResultHandling() { return resultHandling; }
159
-    public void setResultHandling(String resultHandling) { this.resultHandling = resultHandling; }
160
-
161
-    public BigDecimal getDeductScore() { return deductScore; }
162
-    public void setDeductScore(BigDecimal deductScore) { this.deductScore = deductScore; }
163
-
164
-    public BigDecimal getAddScore() { return addScore; }
165
-    public void setAddScore(BigDecimal addScore) { this.addScore = addScore; }
166
-
167
-    public String getScoreDimension() { return scoreDimension; }
168
-    public void setScoreDimension(String scoreDimension) { this.scoreDimension = scoreDimension; }
169
-
170
-    public String getScoreIndicator() { return scoreIndicator; }
171
-    public void setScoreIndicator(String scoreIndicator) { this.scoreIndicator = scoreIndicator; }
132
+    public String getChannelNo() { return channelNo; }
133
+    public void setChannelNo(String channelNo) { this.channelNo = channelNo; }
172 134
 
173
-    public String getEvidenceFile() { return evidenceFile; }
174
-    public void setEvidenceFile(String evidenceFile) { this.evidenceFile = evidenceFile; }
135
+    public String getPosition() { return position; }
136
+    public void setPosition(String position) { this.position = position; }
175 137
 
176
-    public String getRemark() { return remark; }
177
-    public void setRemark(String remark) { this.remark = remark; }
138
+    public Long getPositionId() { return positionId; }
139
+    public void setPositionId(Long positionId) { this.positionId = positionId; }
178 140
 
179
-    public String getImportBatch() { return importBatch; }
180
-    public void setImportBatch(String importBatch) { this.importBatch = importBatch; }
141
+    public String getInspectedName() { return inspectedName; }
142
+    public void setInspectedName(String inspectedName) { this.inspectedName = inspectedName; }
181 143
 
182
-    public String getSourceType() { return sourceType; }
183
-    public void setSourceType(String sourceType) { this.sourceType = sourceType; }
144
+    public Long getInspectedId() { return inspectedId; }
145
+    public void setInspectedId(Long inspectedId) { this.inspectedId = inspectedId; }
184 146
 
185
-    public String getSyncFlag() { return syncFlag; }
186
-    public void setSyncFlag(String syncFlag) { this.syncFlag = syncFlag; }
147
+    public String getProblemDesc() { return problemDesc; }
148
+    public void setProblemDesc(String problemDesc) { this.problemDesc = problemDesc; }
187 149
 
188
-    // ========== 新增字段的getter/setter ==========
189
-    public String getChannelNo() { return channelNo; }
190
-    public void setChannelNo(String channelNo) { this.channelNo = channelNo; }
150
+    public String getServiceType() { return serviceType; }
151
+    public void setServiceType(String serviceType) { this.serviceType = serviceType; }
191 152
 
192
-    public String getPosition() { return position; }
193
-    public void setPosition(String position) { this.position = position; }
153
+    public String getResultHandling() { return resultHandling; }
154
+    public void setResultHandling(String resultHandling) { this.resultHandling = resultHandling; }
194 155
 
195 156
     public String getProblemLevel() { return problemLevel; }
196 157
     public void setProblemLevel(String problemLevel) { this.problemLevel = problemLevel; }
197 158
 
198
-    public String getServiceContactPerson() { return serviceContactPerson; }
199
-    public void setServiceContactPerson(String serviceContactPerson) { this.serviceContactPerson = serviceContactPerson; }
200
-
201
-    public String getServicePushLeader() { return servicePushLeader; }
202
-    public void setServicePushLeader(String servicePushLeader) { this.servicePushLeader = servicePushLeader; }
159
+    public String getEvidenceFile() { return evidenceFile; }
160
+    public void setEvidenceFile(String evidenceFile) { this.evidenceFile = evidenceFile; }
203 161
 
204 162
     public String getRectificationStatus() { return rectificationStatus; }
205 163
     public void setRectificationStatus(String rectificationStatus) { this.rectificationStatus = rectificationStatus; }
@@ -207,40 +165,27 @@ public class LedgerServicePatrol extends BaseEntity {
207 165
     public String getEvidenceMaterial() { return evidenceMaterial; }
208 166
     public void setEvidenceMaterial(String evidenceMaterial) { this.evidenceMaterial = evidenceMaterial; }
209 167
 
210
-    public String getSendToRelevant() { return sendToRelevant; }
211
-    public void setSendToRelevant(String sendToRelevant) { this.sendToRelevant = sendToRelevant; }
212
-
213
-    public Integer getMonthlyProblemCount() { return monthlyProblemCount; }
214
-    public void setMonthlyProblemCount(Integer monthlyProblemCount) { this.monthlyProblemCount = monthlyProblemCount; }
215
-
216 168
     public String getCheckPersonnel() { return checkPersonnel; }
217 169
     public void setCheckPersonnel(String checkPersonnel) { this.checkPersonnel = checkPersonnel; }
218 170
 
219
-    public String getManageServiceManager() { return manageServiceManager; }
220
-    public void setManageServiceManager(String manageServiceManager) { this.manageServiceManager = manageServiceManager; }
221
-
222
-    public String getTeamInternalDuty() { return teamInternalDuty; }
223
-    public void setTeamInternalDuty(String teamInternalDuty) { this.teamInternalDuty = teamInternalDuty; }
224
-
225
-    public String getTeamLeader() { return teamLeader; }
226
-    public void setTeamLeader(String teamLeader) { this.teamLeader = teamLeader; }
171
+    public BigDecimal getDeductScore() { return deductScore; }
172
+    public void setDeductScore(BigDecimal deductScore) { this.deductScore = deductScore; }
227 173
 
228
-    // ========== ID字段的getter/setter ==========
229
-    public Long getInspectedId() { return inspectedId; }
230
-    public void setInspectedId(Long inspectedId) { this.inspectedId = inspectedId; }
174
+    public BigDecimal getAddScore() { return addScore; }
175
+    public void setAddScore(BigDecimal addScore) { this.addScore = addScore; }
231 176
 
232
-    public Long getDeptId() { return deptId; }
233
-    public void setDeptId(Long deptId) { this.deptId = deptId; }
177
+    public String getScoreDimension() { return scoreDimension; }
178
+    public void setScoreDimension(String scoreDimension) { this.scoreDimension = scoreDimension; }
234 179
 
235
-    public Long getTeamId() { return teamId; }
236
-    public void setTeamId(Long teamId) { this.teamId = teamId; }
180
+    public String getScoreIndicator() { return scoreIndicator; }
181
+    public void setScoreIndicator(String scoreIndicator) { this.scoreIndicator = scoreIndicator; }
237 182
 
238
-    public Long getGroupId() { return groupId; }
239
-    public void setGroupId(Long groupId) { this.groupId = groupId; }
183
+    public String getImportBatch() { return importBatch; }
184
+    public void setImportBatch(String importBatch) { this.importBatch = importBatch; }
240 185
 
241
-    public Long getPositionId() { return positionId; }
242
-    public void setPositionId(Long positionId) { this.positionId = positionId; }
186
+    public String getSourceType() { return sourceType; }
187
+    public void setSourceType(String sourceType) { this.sourceType = sourceType; }
243 188
 
244
-    public Long getAreaId() { return areaId; }
245
-    public void setAreaId(Long areaId) { this.areaId = areaId; }
246
-}
189
+    public String getSyncFlag() { return syncFlag; }
190
+    public void setSyncFlag(String syncFlag) { this.syncFlag = syncFlag; }
191
+}

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

@@ -164,10 +164,8 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
164 164
 
165 165
     /** 1. 部门监察问题记录表 → ledger_supervision_problem
166 166
      * 导入顺序:时间(0) 区域(1) 工作点(2) 岗位(3) 责任人(4) 问题描述(5)
167
-     *          问题类型(6) 整改措施(7) 依据(8) 问题层级(9) 班组(10)
168
-     *          队室质控员(11) 质控推送队室负责人(12) 附件(13) 整改情况(14) 佐证材料(15)
169
-     *          发送至相关人员(16) 本月内发生问题次数(17) 上月质控问题超过三次人员(18)
170
-     *          检查人员(19) 分管质控经理(20) 录入时间(21) 部门培训教员(22) 队室内勤(23) 队室负责人(24)
167
+     *          问题类型(6) 整改措施(7) 依据(8) 问题层级(9) 附件(10)
168
+     *          整改情况(11) 整改佐证材料(12) 巡查人员(13)
171 169
      */
172 170
     private int doSupervisionProblem(Sheet sheet, String batchNo, String username) {
173 171
         List<LedgerSupervisionProblem> list = new ArrayList<>();
@@ -313,12 +311,8 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
313 311
 //    }
314 312
 
315 313
     /** 3. 部门实时质控拦截情况记录表 → ledger_realtime_interception
316
-     * 导入顺序:时间(0) 区域(1) 工作点(2) 岗位(3) 责任人(4) 实时质控拦截物品(5) 个数(6)
317
-     *          问题类型(7) 整改措施(8) 问题层级(9) 班组(10) 附件(11) 问题类别(12)
318
-     *          个人复盘(13) 队室复盘(14) 队室质控员(15) 质控推送队室负责人(16)
319
-     *          开机年限(17) 责任人开机年龄(18) 发送至相关人员(19) 本月内发生问题次数(20)
320
-     *          上月质控问题发生次数(21) 实时图像漏检难易度(22) 检查人员(23) 部门培训教员(24)
321
-     *          分管质控经理(25) 队室内勤(26) 备注(27) 队室负责人(28)
314
+     * 导入顺序:时间(0) 区域(1) 工作点(2) 岗位(3) 责任人(4) 实时质控拦截物品(5)
315
+     *          个数(6) 问题层级(7) 附件(8) 检查人员(9)
322 316
      */
323 317
     private int doRealtimeInterception(Sheet sheet, String batchNo, String username) {
324 318
         List<LedgerRealtimeInterception> list = new ArrayList<>();
@@ -381,17 +375,14 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
381 375
 
382 376
     /** 4. 服务巡查 → ledger_service_patrol
383 377
      * 导入顺序:时间(0) 区域(1) 工作点(2) 岗位(3) 责任人(4) 问题描述(5)
384
-     *          问题类型(6) 整改措施(7) 班组(8) 问题层级(9) 队室服务联络人(10)
385
-     *          服务推送队室负责人(11) 附件(12) 整改情况(13) 佐证材料(14)
386
-     *          发送至相关人员(15) 本月内发生问题次数(16) 检查人员(17)
387
-     *          分管服务经理(18) 队室内勤(19) 队室负责人(20)
378
+     *          问题类型(6) 整改措施(7) 问题层级(8) 附件(9) 整改情况(10)
379
+     *          佐证材料(11) 检查人员(12)
388 380
      */
389 381
     private int doServicePatrol(Sheet sheet, String batchNo, String username) {
390 382
         List<LedgerServicePatrol> list = new ArrayList<>();
391 383
         for (Object[] c : dataRows(sheet, 2)) {
392 384
             LedgerServicePatrol o = new LedgerServicePatrol();
393 385
             
394
-            // 按照新的导入顺序映射字段
395 386
             o.setRecordDate(date(c, 0));              // 时间
396 387
             o.setLocation(str(c, 1));                 // 区域
397 388
             o.setChannelNo(str(c, 2));                // 工作点
@@ -402,20 +393,12 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
402 393
             o.setProblemDesc(str(c, 5));              // 问题描述
403 394
             o.setServiceType(str(c, 6));              // 问题类型
404 395
             o.setResultHandling(str(c, 7));           // 整改措施
405
-            o.setTeamName(str(c, 8));                 // 班组
406
-            o.setProblemLevel(str(c, 9));             // 问题层级
407
-            o.setServiceContactPerson(str(c, 10));    // 队室服务联络人
408
-            o.setServicePushLeader(str(c, 11));       // 服务推送队室负责人
409
-            o.setEvidenceFile(str(c, 12));            // 附件
410
-            o.setRectificationStatus(str(c, 13));     // 整改情况
411
-            o.setEvidenceMaterial(str(c, 14));        // 佐证材料
412
-            o.setSendToRelevant(str(c, 15));          // 发送至相关人员
413
-            o.setMonthlyProblemCount(integer(c, 16)); // 本月内发生问题次数
414
-            o.setCheckPersonnel(str(c, 17));          // 检查人员
415
-            o.setManageServiceManager(str(c, 18));    // 分管服务经理
416
-            o.setTeamInternalDuty(str(c, 19));        // 队室内勤
417
-            o.setTeamLeader(str(c, 20));              // 队室负责人
418
-            
396
+            o.setProblemLevel(str(c, 8));             // 问题层级
397
+            o.setEvidenceFile(str(c, 9));             // 附件
398
+            o.setRectificationStatus(str(c, 10));     // 整改情况
399
+            o.setEvidenceMaterial(str(c, 11));        // 佐证材料
400
+            o.setCheckPersonnel(str(c, 12));          // 检查人员
401
+
419 402
             // 根据责任人名称查找组织ID和名称
420 403
             if (inspectedName != null && !inspectedName.trim().isEmpty()) {
421 404
                 Map<String, Object> orgInfo = resolveOrgInfoByNameWithCache(inspectedName);
@@ -751,11 +734,11 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
751 734
     }
752 735
 
753 736
     /** 9. 2026查获违规品统计 → ledger_seizure_stats
754
-     * R2: 查获时间(0) 信息提取(1) 信息提取2(2) 部门/队室(3) 工作区域(4) 安检员(5)
755
-     *     安检资格证书等级(6) 岗位(7) 航班号(8) 目的地(9) 进/出港(10) 违规主体(11)
756
-     *     旅客姓名(12) 旅客性别(13) 旅客民族(14) 旅客年龄(15) 违规类别(16)
757
-     *     违规物品种类(17) 二级分类(18) 数量(19) 事件简况(20) 查获位置(21)
758
-     *     处理结果(22) 班组(23) 队室内勤(24) 备注(25) 查获数量(26)
737
+     * R2: 查获日期(0) 查获时间(1) 部门/队室(2) 工作区域(3) 安检员(4)
738
+     *     安检资质(5) 岗位(6) 航班号(7) 目的地(8) 进/出港(9) 违规主体(10)
739
+     *     旅客姓名(11) 旅客性别(12) 旅客民族(13) 旅客年龄(14) 违规类别(15)
740
+     *     违规物品(16) 二级分类(17) 数量(18) 事件简况(19) 查获位置(20)
741
+     *     处理结果(21) 备注(22)
759 742
      */
760 743
     private int doSeizureStats(Sheet sheet, String batchNo, String username) {
761 744
         List<LedgerSeizureStats> list = new ArrayList<>();

+ 25 - 32
airport-ledger/src/main/resources/mapper/ledger/LedgerServicePatrolMapper.xml

@@ -6,20 +6,30 @@
6 6
         <id property="id" column="id" />
7 7
         <result property="recordDate" column="record_date" />
8 8
         <result property="deptName" column="dept_name" />
9
+        <result property="deptId" column="dept_id" />
9 10
         <result property="teamName" column="team_name" />
11
+        <result property="teamId" column="team_id" />
10 12
         <result property="groupName" column="group_name" />
11
-        <result property="inspectorName" column="inspector_name" />
13
+        <result property="groupId" column="group_id" />
14
+        <result property="areaId" column="area_id" />
15
+        <result property="location" column="location" />
16
+        <result property="channelNo" column="channel_no" />
17
+        <result property="position" column="position" />
18
+        <result property="positionId" column="position_id" />
12 19
         <result property="inspectedName" column="inspected_name" />
13
-        <result property="serviceType" column="service_type" />
20
+        <result property="inspectedId" column="inspected_id" />
14 21
         <result property="problemDesc" column="problem_desc" />
15
-        <result property="location" column="location" />
22
+        <result property="serviceType" column="service_type" />
16 23
         <result property="resultHandling" column="result_handling" />
24
+        <result property="problemLevel" column="problem_level" />
25
+        <result property="evidenceFile" column="evidence_file" />
26
+        <result property="rectificationStatus" column="rectification_status" />
27
+        <result property="evidenceMaterial" column="evidence_material" />
28
+        <result property="checkPersonnel" column="check_personnel" />
17 29
         <result property="deductScore" column="deduct_score" />
18 30
         <result property="addScore" column="add_score" />
19 31
         <result property="scoreDimension" column="score_dimension" />
20 32
         <result property="scoreIndicator" column="score_indicator" />
21
-        <result property="evidenceFile" column="evidence_file" />
22
-        <result property="remark" column="remark" />
23 33
         <result property="importBatch" column="import_batch" />
24 34
         <result property="sourceType" column="source_type" />
25 35
         <result property="createBy" column="create_by" />
@@ -27,33 +37,16 @@
27 37
         <result property="updateBy" column="update_by" />
28 38
         <result property="updateTime" column="update_time" />
29 39
         <result property="syncFlag" column="sync_flag" />
30
-        <!-- 新增字段 -->
31
-        <result property="channelNo" column="channel_no" />
32
-        <result property="position" column="position" />
33
-        <result property="problemLevel" column="problem_level" />
34
-        <result property="serviceContactPerson" column="service_contact_person" />
35
-        <result property="servicePushLeader" column="service_push_leader" />
36
-        <result property="rectificationStatus" column="rectification_status" />
37
-        <result property="evidenceMaterial" column="evidence_material" />
38
-        <result property="sendToRelevant" column="send_to_relevant" />
39
-        <result property="monthlyProblemCount" column="monthly_problem_count" />
40
-        <result property="checkPersonnel" column="check_personnel" />
41
-        <result property="manageServiceManager" column="manage_service_manager" />
42
-        <result property="teamInternalDuty" column="team_internal_duty" />
43
-        <result property="teamLeader" column="team_leader" />
44
-        <!-- ID字段 -->
45
-        <result property="inspectedId" column="inspected_id" />
46
-        <result property="deptId" column="dept_id" />
47
-        <result property="teamId" column="team_id" />
48
-        <result property="groupId" column="group_id" />
49
-        <result property="positionId" column="position_id" />
50
-        <result property="areaId" column="area_id" />
51 40
     </resultMap>
52 41
 
53 42
     <sql id="selectVo">
54
-        SELECT id, record_date, dept_name, team_name, group_name, inspector_name, inspected_name, service_type, problem_desc, location, result_handling, deduct_score, add_score, score_dimension, score_indicator, evidence_file, remark, import_batch, source_type, create_by, create_time, update_by, update_time, sync_flag,
55
-               channel_no, position, problem_level, service_contact_person, service_push_leader, rectification_status, evidence_material, send_to_relevant, monthly_problem_count, check_personnel, manage_service_manager, team_internal_duty, team_leader,
56
-               inspected_id, dept_id, team_id, group_id, position_id, area_id
43
+        SELECT id, record_date, dept_name, dept_id, team_name, team_id, group_name, group_id, area_id,
44
+               location, channel_no, position, position_id,
45
+               inspected_name, inspected_id,
46
+               problem_desc, service_type, result_handling, problem_level,
47
+               evidence_file, rectification_status, evidence_material, check_personnel,
48
+               deduct_score, add_score, score_dimension, score_indicator,
49
+               import_batch, source_type, create_by, create_time, update_by, update_time, sync_flag
57 50
         FROM ledger_service_patrol
58 51
         WHERE del_flag = '0'
59 52
     </sql>
@@ -65,10 +58,10 @@
65 58
         <if test="inspectedName != null and inspectedName != ''">AND inspected_name LIKE CONCAT('%', #{inspectedName}, '%')</if>
66 59
         <if test="syncFlag != null and syncFlag != ''">AND sync_flag = #{syncFlag}</if>
67 60
         <if test="params != null and params.beginTime != null and params.beginTime != ''">
68
-            AND (record_date &gt;= #{params.beginTime} OR approve_date &gt;= #{params.beginTime} OR exam_date &gt;= #{params.beginTime})
61
+            AND record_date &gt;= #{params.beginTime}
69 62
         </if>
70 63
         <if test="params != null and params.endTime != null and params.endTime != ''">
71
-            AND (record_date &lt;= #{params.endTime} OR approve_date &lt;= #{params.endTime} OR exam_date &lt;= #{params.endTime})
64
+            AND record_date &lt;= #{params.endTime}
72 65
         </if>
73 66
         ORDER BY id DESC
74 67
     </select>
@@ -78,4 +71,4 @@
78 71
         set sync_flag = '1'
79 72
         where sync_flag = '0'
80 73
     </update>
81
-</mapper>
74
+</mapper>