提交报修关联楼栋

.idea/compiler.xml

@@ -3,6 +3,20 @@
   <component name="CompilerConfiguration">
     <annotationProcessing>
       <profile default="true" name="Default" enabled="true" />
+      <profile name="Maven default annotation processors profile" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <module name="repair_system" />
+      </profile>
     </annotationProcessing>
+    <bytecodeTargetLevel>
+      <module name="repair_system" target="1.8" />
+    </bytecodeTargetLevel>
+  </component>
+  <component name="JavacSettings">
+    <option name="ADDITIONAL_OPTIONS_OVERRIDE">
+      <module name="repair_system" options="-parameters" />
+    </option>
   </component>
 </project>

.idea/encodings.xml

@@ -2,17 +2,5 @@
 <project version="4">
   <component name="Encoding">
     <file url="file://$PROJECT_DIR$" charset="UTF-8" />
-<<<<<<< HEAD
-    <file url="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/HttpsClient.java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/MyX509TrustManager.java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/SHA1.java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/TimeExchange.java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/WxConstants.java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/WxUtil.java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/AlterPriceRequest.java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/src/main/java/com/repair/model/result/Wx_user.java" charset="UTF-8" />
-    <file url="PROJECT" charset="UTF-8" />
-=======
->>>>>>> 1e8a464588113a3afc236ee3f004f164bb7128ff
   </component>
 </project>

pom.xml

@@ -204,13 +204,6 @@
             <artifactId>jsch</artifactId>
             <version>0.1.49</version>
         </dependency>
-
-        <dependency>
-            <!--            dom4j是一个可以解析XML文件的java组件,我们把他引入-->
-            <groupId>org.dom4j</groupId>
-            <artifactId>dom4j</artifactId>
-            <version>2.1.3</version>
-        </dependency>
     </dependencies>
 
     <build>

src/main/resources/application-prod.yml

@@ -13,7 +13,7 @@ spring:
   datasource:
     username: root
     password: Chuanghai_2023.
-    url: jdbc:mysql://172.16.20.95:3306/repair_report?characterEncoding=UTF-8&share_videosuseSSL=false&useUnicode=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://172.16.20.95:3306/repair_data?characterEncoding=UTF-8&share_videosuseSSL=false&useUnicode=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
     driver-class-name: com.mysql.cj.jdbc.Driver
     cache:
       type: redis
@@ -41,9 +41,9 @@ spring:
   # \u914D\u7F6E\u65E5\u5FD7
 mybatis-plus:
   mapper-locations: classpath:/mapper/repair/*.xml
-  configuration:
+#  configuration:
 #    #开启sql打印
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 #    #关闭sql打印
 #    log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
   global-config:

src/main/resources/mapper/repair/RepairUserMapper.xml

@@ -79,8 +79,8 @@
     </resultMap>
     <select id="queryUserData" resultType="com.repair.model.vo.UserDataVo" resultMap="userDataMap">
         select ru.user_phone,ru.acceptance_assess_time,ru.maintenance_assess_time,ru.state,ru.id,ru.user_name,rcs.start_date,rcs.shift_id,
-        (select (select GROUP_CONCAT(id) from repair_article_type where (id =repair_article_build.article_id or parent_id = repair_article_build.article_id) and deleted = 0)
-        from repair_article_build where deleted = 0 and user_id = ru.id) as article_id
+        (select GROUP_CONCAT(a.articleId) from (select (select GROUP_CONCAT(id) from repair_article_type where (id =repair_article_build.article_id or parent_id = repair_article_build.article_id) and deleted = 0) as articleId
+        from repair_article_build where deleted = 0 and user_id = ru.id) a) as article_id
         from repair_user ru
         left join repair_classes_settings rcs on rcs.deleted = 0 and rcs.user_id = #{userId} and start_date = #{dateNow}
         where ru.id = #{userId} and ru.deleted = 0
@@ -239,14 +239,13 @@
 
     <select id="dropDown" resultType="com.repair.model.vo.AutoDispatchUserVo">
         select * from (
-        select wt.name as work_type,'正常接单' as state,(select count(*) from repair_dispatch_record where deleted = 0 and is_lose_efficacy = 0  and users_id = ru.id) as rdr_count,ru.build_id,ru.user_phone,ru.acceptance_assess_time,ru.maintenance_assess_time,ru.id,ru.user_name,rcs.start_date,rcs.shift_id,
-        (select (select GROUP_CONCAT(id) from repair_article_type where (id = repair_article_build.article_id or parent_id = repair_article_build.article_id) and deleted = 0) as article_id
-        from repair_article_build
-        where deleted = 0 and user_id = ru.id) as article_id from repair_user ru
-        inner join repair_classes_settings rcs on rcs.deleted = 0 and rcs.user_id = ru.id
-        left join repair_work_type wt on wt.deleted = 0 and wt.id = ru.work_type
-        where ru.school_id = #{schoolId} and ru.deleted = 0 and (ru.user_zzid = 1 or ru.user_zzid = 2) and ru.state = 1 and ru.id != ${userId}
-        group by ru.id) t where FIND_IN_SET(${articleId},t.article_id) and FIND_IN_SET(${buildId},t.build_id)
-        order by t.rdr_count
+    select wt.name as work_type,'正常接单' as state,(select count(*) from repair_dispatch_record where deleted = 0 and is_lose_efficacy = 0  and users_id = ru.id) as rdr_count,ru.build_id,ru.user_phone,ru.acceptance_assess_time,ru.maintenance_assess_time,ru.id,ru.user_name,rcs.start_date,rcs.shift_id,
+    (select GROUP_CONCAT(a.articleId) from (select (select GROUP_CONCAT(id) from repair_article_type where (id =repair_article_build.article_id or parent_id = repair_article_build.article_id) and deleted = 0) as articleId
+        from repair_article_build where deleted = 0 and user_id = ru.id) a) as article_id from repair_user ru
+    inner join repair_classes_settings rcs on rcs.deleted = 0 and rcs.user_id = ru.id and rcs.start_date = CURRENT_DATE()
+    left join repair_work_type wt on wt.deleted = 0 and wt.id = ru.work_type
+    where ru.school_id = #{schoolId} and ru.deleted = 0 and (ru.user_zzid = 1 or ru.user_zzid = 2) and ru.state = 1 and ru.id != ${userId}) t where FIND_IN_SET(${articleId},t.article_id) and FIND_IN_SET(${buildId},t.build_id)
+    order by t.rdr_count
     </select>
+
 </mapper>

target/classes/META-INF/spring-configuration-metadata.json

@@ -4,6 +4,11 @@
       "name": "openid",
       "type": "com.repair.config.WxOpenidConfig",
       "sourceType": "com.repair.config.WxOpenidConfig"
+    },
+    {
+      "name": "tencentcloud",
+      "type": "com.repair.config.SmsConfig",
+      "sourceType": "com.repair.config.SmsConfig"
     }
   ],
   "properties": [
@@ -34,8 +39,6 @@
     },
     {
       "name": "openid.shappid",
-<<<<<<< HEAD
-=======
       "type": "java.lang.String",
       "sourceType": "com.repair.config.WxOpenidConfig"
     },
@@ -56,24 +59,33 @@
     },
     {
       "name": "tencentcloud.sdk-appid",
->>>>>>> 1e8a464588113a3afc236ee3f004f164bb7128ff
       "type": "java.lang.String",
-      "sourceType": "com.repair.config.WxOpenidConfig"
+      "sourceType": "com.repair.config.SmsConfig"
     },
     {
-      "name": "openid.shsecret",
+      "name": "tencentcloud.secret-i-d",
       "type": "java.lang.String",
-      "sourceType": "com.repair.config.WxOpenidConfig"
+      "sourceType": "com.repair.config.SmsConfig"
     },
     {
-      "name": "openid.xappid",
+      "name": "tencentcloud.secret-key",
       "type": "java.lang.String",
-      "sourceType": "com.repair.config.WxOpenidConfig"
+      "sourceType": "com.repair.config.SmsConfig"
     },
     {
-      "name": "openid.xsecret",
+      "name": "tencentcloud.sign-name",
       "type": "java.lang.String",
-      "sourceType": "com.repair.config.WxOpenidConfig"
+      "sourceType": "com.repair.config.SmsConfig"
+    },
+    {
+      "name": "tencentcloud.sms-min",
+      "type": "java.lang.String",
+      "sourceType": "com.repair.config.SmsConfig"
+    },
+    {
+      "name": "tencentcloud.template-id",
+      "type": "java.lang.String",
+      "sourceType": "com.repair.config.SmsConfig"
     }
   ],
   "hints": []

target/classes/application-prod.yml

@@ -13,7 +13,7 @@ spring:
   datasource:
     username: root
     password: Chuanghai_2023.
-    url: jdbc:mysql://172.16.20.95:3306/repair_report?characterEncoding=UTF-8&share_videosuseSSL=false&useUnicode=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://172.16.20.95:3306/repair_data?characterEncoding=UTF-8&share_videosuseSSL=false&useUnicode=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
     driver-class-name: com.mysql.cj.jdbc.Driver
     cache:
       type: redis
@@ -41,9 +41,9 @@ spring:
   # \u914D\u7F6E\u65E5\u5FD7
 mybatis-plus:
   mapper-locations: classpath:/mapper/repair/*.xml
-  configuration:
+#  configuration:
 #    #开启sql打印
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 #    #关闭sql打印
 #    log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
   global-config:

target/classes/mapper/repair/RepairAdminMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.repair.mapper.RepairAdminMapper">
+
+</mapper>

target/classes/mapper/repair/RepairAreaMapper.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.repair.mapper.RepairAreaMapper">
+    <!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.repair.model.vo.RepairSchoolVo" id="repairSchoolMap">
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+    </resultMap>
+
+    <select id="queryRepairSchools" resultMap="repairSchoolMap">
+        select id,name from repair_area where parent_id = 0 and deleted = 0
+    </select>
+
+</mapper>

target/classes/mapper/repair/RepairArticleBuildMapper.xml

@@ -2,20 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.repair.mapper.RepairArticleBuildMapper">
 
-<<<<<<< HEAD
-=======
-    <!--#获取待处理池数据-->
-    <resultMap type="com.repair.model.vo.ArticleBuildVo" id="repairArticleBuildMap">
-        <result property="userId" column="user_id"/>
-        <result property="articleId" column="article_id"/>
-        <result property="buildId" column="build_id"/>
-    </resultMap>
-
-    <select id="queryArticleBuild" resultType="com.repair.model.vo.ArticleBuildVo" resultMap="repairArticleBuildMap">
-        select user_id,(select GROUP_CONCAT(id) from repair_article_type where id in (repair_article_build.article_id) or parent_id in (repair_article_build.article_id) and deleted = 0) as article_id,build_id
-        from repair_article_build
-        where deleted = 0 and user_id in (${userIds})
-    </select>
-
->>>>>>> ad80b4e35f8af32a80da24920b5f5775bb80cda3
 </mapper>

target/classes/mapper/repair/RepairArticleTypeMapper.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.repair.mapper.RepairArticleTypeMapper">
+    <!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.repair.model.vo.RepairWorkTypeVo" id="repairArticleTypeMap">
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+    </resultMap>
+
+    <select id="queryArticleTypeList" resultType="com.repair.model.vo.RepairWorkTypeVo" resultMap="repairArticleTypeMap">
+       select id,name from repair_article_type
+        <where>
+            and deleted = 0 and parent_id = 0
+            <if test="schoolId != null and schoolId != ''">
+                and school_id = #{schoolId}
+            </if>
+        </where>
+    </select>
+
+
+    <resultMap type="com.repair.model.vo.RepairArticleChildVo" id="repairArticleChildMap">
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+        <result property="childId" column="child_id"/>
+    </resultMap>
+
+    <select id="queryArticleChildList" resultType="com.repair.model.vo.RepairArticleChildVo" resultMap="repairArticleChildMap">
+        SELECT CONCAT_WS(',', GROUP_CONCAT(rt.id separator','), rat.id) as child_id,rat.id,rat.`name` FROM repair_article_type rat
+        left join repair_article_type rt on rt.deleted = 0 and rt.parent_id = rat.id
+        where rat.deleted = 0 and rat.parent_id = 0 and rat.school_id = #{schoolId}
+        group by rat.id
+
+    </select>
+    <!--order by locate(#{keyWord},rat.name) desc 按关键字模糊查询排序-->
+
+</mapper>

target/classes/mapper/repair/RepairClassesSettingsMapper.xml

@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.repair.mapper.RepairClassesSettingsMapper">
+
+    <!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.repair.model.vo.ClassesSettingVo" id="repairClassesListMap">
+        <result property="id" column="id"/>
+        <result property="userId" column="user_id"/>
+        <result property="startDate" column="start_date"/>
+        <result property="shiftId" column="shift_id"/>
+        <result property="shiftName" column="shift_name"/>
+        <result property="shiftColor" column="shift_color"/>
+    </resultMap>
+
+    <select id="queryClassesSettingList" resultType="com.repair.model.vo.ClassesSettingVo" resultMap="repairClassesListMap">
+        SELECT rcs.id,rcs.user_id,rcs.start_date,rcs.shift_id,(select GROUP_CONCAT(name) from repair_shift_settings where find_in_set(id,rcs.shift_id) and deleted = 0) as shift_name
+        ,(select GROUP_CONCAT(color) from repair_shift_settings where find_in_set(id,rcs.shift_id) and deleted = 0) as shift_color
+        FROM repair_classes_settings rcs
+        <where>
+            and rcs.deleted = 0
+            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+                and rcs.start_date BETWEEN #{startTime} and #{endTime}
+            </if>
+            <if test="userIds != null and userIds.size() > 0">
+                and rcs.user_id in
+                <foreach collection="userIds" item="userId" index="index" open="(" close=")" separator=",">
+                    ${userId}
+                </foreach>
+            </if>
+        </where>
+    </select>
+
+    <resultMap type="com.repair.model.vo.ClassesDataVo" id="repairClassesDataMap">
+        <result property="id" column="id"/>
+        <result property="userId" column="user_id"/>
+        <result property="shiftId" column="shift_id"/>
+        <result property="shiftName" column="shift_name"/>
+        <result property="shiftColor" column="shift_color"/>
+    </resultMap>
+    <select id="queryClassesDatas" resultType="com.repair.model.vo.ClassesDataVo" resultMap="repairClassesDataMap">
+        SELECT rcs.id,rcs.user_id,rcs.shift_id,(select GROUP_CONCAT(name) from repair_shift_settings where find_in_set(id,rcs.shift_id) and deleted = 0) as shift_name
+        FROM repair_classes_settings rcs
+        <where>
+            and rcs.deleted = 0
+            <if test="startDate != null and startDate != ''">
+                and rcs.start_date = CURRENT_DATE()
+            </if>
+            <if test="userIds != null and userIds.size() > 0">
+                and rcs.user_id in
+                <foreach collection="userIds" item="userId" index="index" open="(" close=")" separator=",">
+                    ${userId}
+                </foreach>
+            </if>
+        </where>
+    </select>
+
+    <select id="queryClassesData" resultType="com.repair.model.vo.ClassesDataVo" resultMap="repairClassesDataMap">
+        SELECT rcs.id,rcs.user_id,rcs.shift_id,(select GROUP_CONCAT(name) from repair_shift_settings where find_in_set(id,rcs.shift_id) and deleted = 0) as shift_name
+        FROM repair_classes_settings rcs
+        <where>
+            and rcs.deleted = 0 and rcs.start_date = CURRENT_DATE()
+            <if test="userId != null and userId != ''">
+                and rcs.user_id = ${userId}
+            </if>
+        </where>
+    </select>
+
+</mapper>

target/classes/mapper/repair/RepairCloseMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.repair.mapper.RepairCloseMapper">
+
+</mapper>

target/classes/mapper/repair/RepairDispatchRecordMapper.xml

@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.repair.mapper.RepairDispatchRecordMapper">
-<<<<<<< HEAD
-=======
     <resultMap type="com.repair.model.vo.RepairCardNumberVo" id="repairCardNumberMap">
         <result property="userId" column="users_id"/>
         <result property="cardNumber" column="card_number"/>
@@ -30,6 +28,5 @@
         (select Count(*) as count from repair_receiving
         where deleted = 0 and is_lose_efficacy = 0 and user_id = #{userId}) as rec_count
     </select>
->>>>>>> 1e8a464588113a3afc236ee3f004f164bb7128ff
 
 </mapper>

target/classes/mapper/repair/RepairEvaluateMapper.xml

@@ -2,18 +2,8 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.repair.mapper.RepairEvaluateMapper">
 
-    <resultMap type="com.repair.model.vo.RecordEvaluateVo" id="repairRecordEvaluateMap">
+    <resultMap type="com.repair.model.vo.EvaluateVo" id="repairEvaluatePageMap">
         <result property="id" column="id"/>
-<<<<<<< HEAD
-        <result property="userId" column="user_id"/>
-        <result property="maintenancerId" column="maintenancer_id"/>
-    </resultMap>
-    <!--当前时间-系统设置的小时-->
-    <select id="queryEvaluateList" resultType="com.repair.model.vo.RecordEvaluateVo" resultMap="repairRecordEvaluateMap">
-        SELECT rr.id,rr.user_id,rr.maintenancer_id FROM repair_record rr
-        where rr.deleted = 0 and rr.maintenance_state = 7 and rr.update_time &lt;= #{dateStr}
-        and NOT EXISTS (select id from repair_evaluate where deleted = 0 and record_id = rr.id)
-=======
         <result property="recordId" column="record_id"/>
         <result property="recordNo" column="record_no"/>
         <result property="userName" column="user_name"/>
@@ -41,7 +31,6 @@
             </if>
         </where>
         order by re.create_time desc
->>>>>>> 1e8a464588113a3afc236ee3f004f164bb7128ff
     </select>
 
     <resultMap type="com.repair.model.vo.RecordEvaluateVo" id="repairRecordEvaluateMap">

target/classes/mapper/repair/RepairLeaveMessageMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.repair.mapper.RepairLeaveMessageMapper">
+
+</mapper>

target/classes/mapper/repair/RepairReceivingMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.repair.mapper.RepairReceivingMapper">
+
+</mapper>

target/classes/mapper/repair/RepairRecordMapper.xml

@@ -2,8 +2,6 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.repair.mapper.RepairRecordMapper">
 
-<<<<<<< HEAD
-=======
     <resultMap type="com.repair.model.vo.RepairRecordCountVo" id="repairRecordCountMap">
         <result property="Incomplete" column="Incomplete"/>
         <result property="Confirmed" column="Confirmed"/>
@@ -583,26 +581,11 @@
     </select>
 
 
->>>>>>> 1e8a464588113a3afc236ee3f004f164bb7128ff
     <!--#获取待处理池数据-->
     <resultMap type="com.repair.model.vo.pendingOrderVo" id="repairPendingOrderMap">
         <result property="id" column="id"/>
-        <result property="userId" column="user_id"/>
-        <result property="schoolId" column="school_id"/>
+        <result property="recordNo" column="record_no"/>
         <result property="reportTime" column="report_time"/>
-<<<<<<< HEAD
-        <result property="articleId" column="article_id"/>
-        <result property="buildId" column="build_id"/>
-    </resultMap>
-
-    <select id="queryPendingOrder" resultType="com.repair.model.vo.pendingOrderVo" resultMap="repairPendingOrderMap">
-        select * from (select (select Count(*) from repair_dispatch_record where is_lose_efficacy = 0 and record_id = rr.id and receiving_time is null) as disp_count,rr.id,
-        rr.article_id,rr.user_id,rr.school_id,rr.report_time,rr.build_id
-        from repair_record rr
-        where rr.maintenance_state = 1 and rr.deleted = 0) t where t.disp_count &lt;= 0
-        order by t.report_time desc
-    </select>
-=======
         <result property="userName" column="user_name"/>
         <result property="userPhone" column="user_phone"/>
         <result property="areaName" column="area_name"/>
@@ -1474,7 +1457,6 @@
                                                            as affirm_count
     </select>
 
-<<<<<<< HEAD
     <!--打印-->
     <resultMap type="com.repair.model.vo.PrintVo" id="PrintDataMap">
         <result property="recordNo" column="record_no"/>
@@ -1507,7 +1489,4 @@
     </select>
 
 
-=======
->>>>>>> 1e8a464588113a3afc236ee3f004f164bb7128ff
->>>>>>> ad80b4e35f8af32a80da24920b5f5775bb80cda3
 </mapper>

target/classes/mapper/repair/RepairRefundRecordMapper.xml

@@ -1,18 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.repair.mapper.RepairRefundRecordMapper">
-    <resultMap type="com.repair.model.vo.repairRefundVo" id="repairRefundMap">
-        <result property="id" column="id"/>
-        <result property="payPrice" column="pay_price"/>
-        <result property="recordNo" column="record_no"/>
-        <result property="recordId" column="record_id"/>
-    </resultMap>
 
-    <!--查询退款中的订单-->
-    <select id="queryRefundRecord" resultType="com.repair.model.vo.repairRefundVo" resultMap="repairRefundMap">
-        select rrr.id,rpr.pay_price,rr.record_no,rrr.record_id from repair_refund_record rrr
-        left join repair_record rr on rr.deleted = 0 and rr.id = rrr.record_id
-        left join repair_pay_record rpr on rpr.record_id = rrr.record_id and rpr.deleted = 0 and rpr.is_success = 0
-        where rrr.approve = 1 and rrr.is_success = 0 and rrr.deleted = 0
-    </select>
 </mapper>

target/classes/mapper/repair/RepairSchoolMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.repair.mapper.RepairSchoolMapper">
+
+</mapper>

target/classes/mapper/repair/RepairUserMapper.xml

@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.repair.mapper.RepairUserMapper">
-<<<<<<< HEAD
-=======
 
     <resultMap type="com.repair.model.vo.RepairUserVo" id="repairUserPageMap">
         <result property="id" column="id"/>
@@ -81,8 +79,8 @@
     </resultMap>
     <select id="queryUserData" resultType="com.repair.model.vo.UserDataVo" resultMap="userDataMap">
         select ru.user_phone,ru.acceptance_assess_time,ru.maintenance_assess_time,ru.state,ru.id,ru.user_name,rcs.start_date,rcs.shift_id,
-        (select (select GROUP_CONCAT(id) from repair_article_type where (id =repair_article_build.article_id or parent_id = repair_article_build.article_id) and deleted = 0)
-        from repair_article_build where deleted = 0 and user_id = ru.id) as article_id
+        (select GROUP_CONCAT(a.articleId) from (select (select GROUP_CONCAT(id) from repair_article_type where (id =repair_article_build.article_id or parent_id = repair_article_build.article_id) and deleted = 0) as articleId
+        from repair_article_build where deleted = 0 and user_id = ru.id) a) as article_id
         from repair_user ru
         left join repair_classes_settings rcs on rcs.deleted = 0 and rcs.user_id = #{userId} and start_date = #{dateNow}
         where ru.id = #{userId} and ru.deleted = 0
@@ -154,7 +152,6 @@
         </where>
     </select>
 
->>>>>>> 1e8a464588113a3afc236ee3f004f164bb7128ff
     <resultMap type="com.repair.model.vo.AutoDispatchUserVo" id="AutoDispatchUserMap">
         <result property="id" column="id"/>
         <result property="state" column="state"/>
@@ -166,16 +163,10 @@
         <result property="maintenanceTime" column="maintenance_assess_time"/>
         <result property="startDate" column="start_date"/>
         <result property="shiftId" column="shift_id"/>
-<<<<<<< HEAD
-=======
-        <result property="schoolId" column="school_id"/>
-        <result property="rdrCount" column="rdr_count"/>
->>>>>>> ad80b4e35f8af32a80da24920b5f5775bb80cda3
     </resultMap>
 
     <select id="autoDispatchUser" resultType="com.repair.model.vo.AutoDispatchUserVo" resultMap="AutoDispatchUserMap">
         select * from (
-<<<<<<< HEAD
         select ru.user_zzid,wt.name as work_type,'正常接单' as state,(select count(*) from repair_dispatch_record where deleted = 0 and is_lose_efficacy = 0 and assigned_time like '%' #{dateNow} '%' and users_id = ru.id) as rdr_count,ru.user_phone,ru.acceptance_assess_time,ru.maintenance_assess_time,ru.id,ru.user_name,rcs.start_date,rcs.shift_id
         from repair_user ru
         inner join repair_classes_settings rcs on rcs.deleted = 0 and rcs.user_id = ru.id and start_date = #{dateNow}
@@ -189,23 +180,9 @@
         <if test="keyWord != null and keyWord != ''">
             and (ru.user_name like '%' #{keyWord} '%' or ru.user_phone like '%' #{keyWord} '%')
         </if>
-=======
-<<<<<<< HEAD
-        select wt.name as work_type,'大量接单' as state,(select count(*) from repair_dispatch_record where deleted = 0 and is_lose_efficacy = 0 and assigned_time like '%' #{dateNow} '%' and users_id = ru.id) as rdr_count,ru.user_phone,ru.acceptance_assess_time,ru.maintenance_assess_time,ru.id,ru.user_name,rcs.start_date,rcs.shift_id,ru.school_id
-=======
-        select wt.name as work_type,'大量接单' as state,(select count(*) from repair_dispatch_record where deleted = 0 and is_lose_efficacy = 0 and assigned_time like '%' #{dateNow} '%' and users_id = ru.id) as rdr_count,ru.build_id,ru.user_phone,ru.acceptance_assess_time,ru.maintenance_assess_time,ru.id,ru.user_name,rcs.start_date,rcs.shift_id
-        ,(select GROUP_CONCAT(id) from repair_article_type where FIND_IN_SET(id,ru.article_id) or FIND_IN_SET(parent_id,ru.article_id) and deleted = 0) as article_id
->>>>>>> 1e8a464588113a3afc236ee3f004f164bb7128ff
-        from repair_user ru
-        inner join repair_classes_settings rcs on rcs.deleted = 0 and rcs.user_id = ru.id and start_date = #{dateNow}
-        left join repair_work_type wt on wt.deleted = 0 and wt.id = ru.work_type
-        where ru.deleted = 0 and (ru.user_zzid = 1 or ru.user_zzid = 2) and ru.state = 1
->>>>>>> ad80b4e35f8af32a80da24920b5f5775bb80cda3
         group by ru.id) t
         order by t.rdr_count
     </select>
-<<<<<<< HEAD
-=======
 
 
     <resultMap type="com.repair.model.vo.AutoOfflineUserVo" id="AutoOfflineUserMap">
@@ -262,15 +239,13 @@
 
     <select id="dropDown" resultType="com.repair.model.vo.AutoDispatchUserVo">
         select * from (
-        select wt.name as work_type,'正常接单' as state,(select count(*) from repair_dispatch_record where deleted = 0 and is_lose_efficacy = 0  and users_id = ru.id) as rdr_count,ru.build_id,ru.user_phone,ru.acceptance_assess_time,ru.maintenance_assess_time,ru.id,ru.user_name,rcs.start_date,rcs.shift_id,
-        (select (select GROUP_CONCAT(id) from repair_article_type where (id = repair_article_build.article_id or parent_id = repair_article_build.article_id) and deleted = 0) as article_id
-        from repair_article_build
-        where deleted = 0 and user_id = ru.id) as article_id from repair_user ru
-        inner join repair_classes_settings rcs on rcs.deleted = 0 and rcs.user_id = ru.id
-        left join repair_work_type wt on wt.deleted = 0 and wt.id = ru.work_type
-        where ru.school_id = #{schoolId} and ru.deleted = 0 and (ru.user_zzid = 1 or ru.user_zzid = 2) and ru.state = 1 and ru.id != ${userId}
-        group by ru.id) t where FIND_IN_SET(${articleId},t.article_id) and FIND_IN_SET(${buildId},t.build_id)
-        order by t.rdr_count
+    select wt.name as work_type,'正常接单' as state,(select count(*) from repair_dispatch_record where deleted = 0 and is_lose_efficacy = 0  and users_id = ru.id) as rdr_count,ru.build_id,ru.user_phone,ru.acceptance_assess_time,ru.maintenance_assess_time,ru.id,ru.user_name,rcs.start_date,rcs.shift_id,
+    (select GROUP_CONCAT(a.articleId) from (select (select GROUP_CONCAT(id) from repair_article_type where (id =repair_article_build.article_id or parent_id = repair_article_build.article_id) and deleted = 0) as articleId
+        from repair_article_build where deleted = 0 and user_id = ru.id) a) as article_id from repair_user ru
+    inner join repair_classes_settings rcs on rcs.deleted = 0 and rcs.user_id = ru.id and rcs.start_date = CURRENT_DATE()
+    left join repair_work_type wt on wt.deleted = 0 and wt.id = ru.work_type
+    where ru.school_id = #{schoolId} and ru.deleted = 0 and (ru.user_zzid = 1 or ru.user_zzid = 2) and ru.state = 1 and ru.id != ${userId}) t where FIND_IN_SET(${articleId},t.article_id) and FIND_IN_SET(${buildId},t.build_id)
+    order by t.rdr_count
     </select>
->>>>>>> 1e8a464588113a3afc236ee3f004f164bb7128ff
+
 </mapper>

target/classes/mapper/repair/RepairWorkTypeMapper.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.repair.mapper.RepairWorkTypeMapper">
+    <!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.repair.model.vo.RepairWorkTypeVo" id="repairWorkTypeMap">
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+    </resultMap>
+
+    <select id="queryWorkTypeList" resultType="com.repair.model.vo.RepairWorkTypeVo" resultMap="repairWorkTypeMap">
+       select id,name from repair_work_type where deleted = 0
+    </select>
+</mapper>

target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -1,20 +1,4 @@
 com\repair\AutoCode.class
-<<<<<<< HEAD
-=======
-com\repair\services\impl\RepairShiftSettingsServiceImpl.class
-<<<<<<< HEAD
-com\repair\mapper\RepairUserMapper.class
-com\repair\model\pojo\WxAccessToken.class
-com\repair\annotation\PassToken.class
-com\repair\config\MySecurity.class
-META-INF\spring-configuration-metadata.json
-com\repair\model\pojo\RepairDispatchRecord.class
-com\repair\mapper\RepairShiftSettingsMapper.class
-com\repair\mapper\RepairTrackRecordMapper.class
-com\repair\model\vo\wxLoginVo.class
-com\repair\mapper\RepairRecordMapper.class
-=======
->>>>>>> ad80b4e35f8af32a80da24920b5f5775bb80cda3
 com\repair\mapper\RepairPayRecordMapper.class
 com\repair\model\vo\RepairTrendVo.class
 com\repair\common\utils\AesUtils.class
@@ -22,16 +6,9 @@ com\repair\services\RepairCollaborateRecordService.class
 com\repair\model\vo\MasterHomepageVo.class
 com\repair\api\LoginControllerAPI.class
 com\repair\api\RepairTransferRecordControllerAPI.class
-<<<<<<< HEAD
 com\repair\model\vo\MaintenanceTechnicianVo.class
-=======
->>>>>>> 1e8a464588113a3afc236ee3f004f164bb7128ff
-com\repair\mapper\RepairEvaluateMapper.class
->>>>>>> ad80b4e35f8af32a80da24920b5f5775bb80cda3
 com\repair\MybatisPlusApplication.class
-com\repair\services\impl\RepairRefundRecordServiceImpl.class
 com\repair\model\pojo\RepairCollaborateRecord.class
-<<<<<<< HEAD
 com\repair\services\RepairConsumeService.class
 com\repair\api\RepairArticleTypeControllerAPI.class
 com\repair\model\vo\ConsumableExcelVo.class
@@ -46,26 +23,6 @@ com\repair\model\vo\SystemMenuTreeVo.class
 com\repair\services\RepairCloseService.class
 com\repair\api\RepairWorkTypeControllerAPI.class
 com\repair\controller\RepairArticleBuildController.class
-=======
-com\repair\services\impl\RepairEvaluateServiceImpl.class
-com\repair\model\pojo\RepairClassesSettings.class
-com\repair\model\vo\RepairTotalDataVo.class
-com\repair\model\pojo\RepairConsume.class
-com\repair\model\pojo\RepairConsumables.class
-com\repair\services\RepairReceivingService.class
-com\repair\services\RepairRefundRecordService.class
-com\repair\model\pojo\RepairPayRecord.class
-com\repair\model\vo\ArticleBuildVo.class
-com\repair\common\utils\HttpUtils.class
-com\repair\common\utils\XmlUtil.class
-com\repair\handle\NonStaticResourceHttpRequestHandler.class
-<<<<<<< HEAD
-com\repair\model\pojo\RepairWorkType.class
-com\repair\common\utils\CommonUtil.class
-com\repair\model\vo\RecordEvaluateVo.class
-=======
-com\repair\model\vo\AlterPriceShowVo.class
->>>>>>> ad80b4e35f8af32a80da24920b5f5775bb80cda3
 com\repair\mapper\RepairConsumeMapper.class
 com\repair\model\vo\ConsumeVo.class
 com\repair\model\vo\PositiveReviewVo.class
@@ -78,33 +35,12 @@ com\repair\services\impl\RepairCollaborateRecordServiceImpl.class
 com\repair\controller\RepairClassesSettingsController.class
 com\repair\model\vo\DisReceCountVo.class
 com\repair\common\utils\DateUtils.class
-<<<<<<< HEAD
-=======
-com\repair\controller\RepairArticleTypeController.class
->>>>>>> 1e8a464588113a3afc236ee3f004f164bb7128ff
-com\repair\services\impl\WxAccessTokenServiceImpl.class
->>>>>>> ad80b4e35f8af32a80da24920b5f5775bb80cda3
 com\repair\model\result\BaseResult.class
-com\repair\common\utils\DelayedUtils$2.class
-com\repair\controller\ScheduleController.class
+com\repair\model\request\repairRecordRequest.class
 com\repair\services\impl\RepairSystemMessagesServiceImpl.class
-com\repair\aop\LoginCheckAspect.class
-com\repair\model\pojo\RepairTrackRecord.class
+com\repair\model\vo\ProsperityRepairPayRecordsVo.class
 com\repair\model\result\PageUtils.class
-<<<<<<< HEAD
-com\repair\model\pojo\UnitTimeHelpModel.class
-=======
-com\repair\model\pojo\RepairUser.class
-com\repair\model\vo\pendingOrderVo.class
 com\repair\model\pojo\UnitTimeHelpModel.class
-com\repair\services\impl\RepairDispatchRecordServiceImpl.class
-com\repair\common\utils\WxUtil$1.class
-com\repair\common\utils\UUIDUtils.class
-<<<<<<< HEAD
-=======
-com\repair\mapper\RepairSchoolMapper.class
-com\repair\model\vo\routeDataVo.class
->>>>>>> ad80b4e35f8af32a80da24920b5f5775bb80cda3
 com\repair\model\enumModel\eStatu.class
 com\repair\mapper\RepairConsumablesMapper.class
 com\repair\model\enumModel\eIsTop.class
@@ -213,10 +149,8 @@ com\repair\model\result\EndPay.class
 com\repair\model\vo\CollaborateDataVo.class
 com\repair\mapper\RepairOfflineRecordMapper.class
 com\repair\mapper\RepairArticleTypeMapper.class
->>>>>>> 1e8a464588113a3afc236ee3f004f164bb7128ff
 com\repair\services\impl\RepairRecordServiceImpl.class
 com\repair\model\pojo\RepairLeaveMessage.class
-<<<<<<< HEAD
 com\repair\model\vo\RepairConsumeypeTreeVo.class
 com\repair\model\vo\RepairArticleTypeTreeVo.class
 com\repair\common\utils\DelayedUtils$1.class
@@ -390,16 +324,9 @@ com\repair\controller\RepairTrackRecordController.class
 com\repair\model\vo\RepairArticleChildVo.class
 com\repair\services\RepairSystemMessagesService.class
 com\repair\api\RepairConsumablesControllerAPI.class
-=======
-com\repair\model\pojo\RepairSystemMessages.class
-com\repair\common\utils\DelayedUtils$1.class
-com\repair\mapper\RepairSystemMessagesMapper.class
-com\repair\model\pojo\RepairArea.class
-com\repair\services\RepairSystemMessagesService.class
->>>>>>> ad80b4e35f8af32a80da24920b5f5775bb80cda3
 com\repair\model\vo\AutoDispatchUserVo.class
+com\repair\model\vo\RepairArticleConsumeVo.class
 com\repair\config\WxOpenidConfig.class
-<<<<<<< HEAD
 com\repair\model\vo\DetailsVo.class
 com\repair\model\enumModel\eIsSuper.class
 com\repair\api\RepairAreaControllerAPI.class
@@ -414,54 +341,12 @@ com\repair\services\RepairSystemSettingService.class
 com\repair\services\RepairArticleBuildService.class
 com\repair\model\request\MaintenanceConsumeablesRequest.class
 com\repair\api\RepairUserControllerAPI.class
-=======
-com\repair\common\utils\TimeExchange.class
-com\repair\model\result\CommonResult.class
-com\repair\common\exception\EmsException.class
-com\repair\model\vo\repairRefundVo.class
-com\repair\common\utils\JWTUtil.class
-com\repair\services\RepairUserService.class
-com\repair\model\pojo\RepairRefundRecord.class
-com\repair\services\RepairSystemSettingService.class
-com\repair\services\WxAccessTokenService.class
-com\repair\model\pojo\RepairSystemSetting.class
-<<<<<<< HEAD
-com\repair\services\RepairArticleBuildService.class
-=======
-com\repair\model\request\MaintenanceConsumeablesRequest.class
->>>>>>> 1e8a464588113a3afc236ee3f004f164bb7128ff
-com\repair\mapper\WxAccessTokenMapper.class
-com\repair\model\pojo\RepairTransferRecord.class
->>>>>>> ad80b4e35f8af32a80da24920b5f5775bb80cda3
 com\repair\config\MyBatisPlusConfig.class
-<<<<<<< HEAD
-com\repair\common\utils\ValidateCode.class
-com\repair\services\RepairDispatchRecordService.class
-com\repair\model\pojo\RepairEvaluate.class
-com\repair\services\RepairTrackRecordService.class
-com\repair\services\RepairEvaluateService.class
-com\repair\mapper\RepairDispatchRecordMapper.class
-com\repair\model\pojo\RepairRecord.class
-com\repair\model\pojo\RepairArticleType.class
-com\repair\config\ScheduledConfig.class
-=======
 com\repair\mapper\RepairWorkTypeMapper.class
 com\repair\services\impl\RepairAreaServiceImpl.class
 com\repair\services\RepairEvaluateService.class
-<<<<<<< HEAD
 com\repair\model\pojo\RepairShiftSettings.class
 com\repair\services\RepairTransferRecordService.class
-=======
-com\repair\model\request\AlterPriceRequest.class
->>>>>>> 1e8a464588113a3afc236ee3f004f164bb7128ff
-com\repair\model\pojo\RepairShiftSettings.class
-com\repair\common\utils\WxConstants.class
-<<<<<<< HEAD
-com\repair\model\pojo\RepairClose.class
-com\repair\services\RepairRecordService.class
-com\repair\mapper\RepairArticleBuildMapper.class
-=======
->>>>>>> ad80b4e35f8af32a80da24920b5f5775bb80cda3
 com\repair\model\request\DelayedRequest.class
 com\repair\services\impl\RepairAdminServiceImpl.class
 com\repair\model\vo\RepairAnalysisVo.class
@@ -469,7 +354,6 @@ com\repair\model\vo\RepairUserVo.class
 com\repair\model\vo\SystemMenuVo.class
 com\repair\mapper\RepairTransferRecordMapper.class
 com\repair\common\utils\smsUtil.class
-<<<<<<< HEAD
 com\repair\mapper\RepairArticleBuildMapper.class
 com\repair\model\request\updateRepairConsumeRequest.class
 com\repair\services\impl\RepairArticleBuildServiceImpl.class
@@ -480,34 +364,6 @@ com\repair\model\vo\MyRepairRecordVo.class
 com\repair\annotation\ControllerIsShow.class
 com\repair\common\utils\RSAUtils.class
 com\repair\model\vo\SystemMenuVo$SystemMenuVoBuilder.class
-=======
->>>>>>> 1e8a464588113a3afc236ee3f004f164bb7128ff
-com\repair\annotation\UserLoginCheck.class
-com\repair\common\utils\DelayedUtils.class
-com\repair\model\pojo\RepairNoticeSetting.class
-com\repair\services\impl\RepairArticleBuildServiceImpl.class
-com\repair\common\utils\SHA1.class
-com\repair\services\impl\RepairSystemSettingServiceImpl.class
-com\repair\common\result\Code.class
-com\repair\services\RepairShiftSettingsService.class
-com\repair\common\utils\WxUtil.class
-com\repair\annotation\ControllerIsShow.class
-com\repair\common\exception\EmsExceptionHandler.class
-<<<<<<< HEAD
-com\repair\model\pojo\RepairArticleBuild.class
-com\repair\services\impl\RepairUserServiceImpl.class
-com\repair\common\result\ResponseStatusEnum.class
-com\repair\services\impl\RepairTrackRecordServiceImpl.class
-com\repair\model\pojo\RepairSchool.class
-com\repair\model\vo\timeVo.class
-com\repair\common\exception\MyCustomException.class
-com\repair\common\utils\DictionaryCompare.class
-com\repair\core\SwaggerConfiguration.class
-com\repair\model\pojo\RepairAdmin.class
-com\repair\mapper\RepairRefundRecordMapper.class
-com\repair\mapper\RepairSystemSettingMapper.class
-=======
->>>>>>> ad80b4e35f8af32a80da24920b5f5775bb80cda3
 com\repair\services\RepairAreaService.class
 com\repair\model\vo\RepairAreaTreeVo$RepairAreaTreeVoBuilder.class
 com\repair\services\impl\RepairTrackRecordServiceImpl.class
@@ -516,10 +372,5 @@ com\repair\common\utils\DictionaryCompare.class
 com\repair\services\RepairConsumablesService.class
 com\repair\model\request\changePasswordRequest.class
 com\repair\model\enumModel\eSchool.class
-<<<<<<< HEAD
-=======
-com\repair\model\vo\CollaborateRecordVo.class
->>>>>>> 1e8a464588113a3afc236ee3f004f164bb7128ff
->>>>>>> ad80b4e35f8af32a80da24920b5f5775bb80cda3
 com\repair\model\pojo\RepairReceiving.class
 com\repair\model\result\Wx_user.class

target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,107 +1,3 @@
-<<<<<<< HEAD
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\common\utils\WxUtil.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\model\pojo\RepairTrackRecord.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\model\pojo\WxAccessToken.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\common\utils\JWTUtil.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\mapper\RepairRefundRecordMapper.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\mapper\RepairUserMapper.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\model\vo\pendingOrderVo.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\common\utils\WxConstants.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\model\pojo\RepairConsumables.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\model\result\CommonResult.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\model\pojo\RepairNoticeSetting.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\model\vo\wxLoginVo.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\services\impl\RepairRefundRecordServiceImpl.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\model\pojo\RepairAdmin.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\services\RepairUserService.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\services\impl\WxAccessTokenServiceImpl.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\services\WxAccessTokenService.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\services\RepairReceivingService.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\common\utils\SHA1.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\model\pojo\RepairLeaveMessage.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\services\RepairEvaluateService.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\model\result\BaseResult.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\mapper\RepairArticleBuildMapper.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\services\impl\RepairArticleBuildServiceImpl.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\model\vo\RecordEvaluateVo.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\annotation\PassToken.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\common\exception\MyCustomException.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\mapper\WxAccessTokenMapper.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\model\pojo\RepairSystemSetting.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\config\MySecurity.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\services\RepairDispatchRecordService.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\core\SwaggerConfiguration.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\model\pojo\RepairCollaborateRecord.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\mapper\RepairTrackRecordMapper.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\common\utils\CommonUtil.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\mapper\RepairSystemMessagesMapper.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\model\pojo\RepairTransferRecord.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\services\RepairTrackRecordService.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\model\pojo\UnitTimeHelpModel.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\model\pojo\RepairArticleType.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\model\pojo\RepairWorkType.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\model\vo\ArticleBuildVo.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\model\pojo\RepairConsume.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\model\pojo\RepairDispatchRecord.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\mapper\RepairRecordMapper.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\model\pojo\RepairRecord.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\services\impl\RepairUserServiceImpl.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\services\RepairRefundRecordService.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\model\pojo\RepairArticleBuild.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\mapper\RepairEvaluateMapper.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\model\result\PageUtils.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\common\utils\UUIDUtils.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\common\utils\DelayedUtils.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\common\utils\HttpUtils.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\model\pojo\RepairUser.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\controller\ScheduleController.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\model\pojo\RepairPayRecord.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\common\result\Code.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\model\pojo\RepairShiftSettings.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\model\pojo\RepairClassesSettings.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\common\utils\DictionaryCompare.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\services\RepairSystemMessagesService.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\model\pojo\RepairSystemMessages.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\mapper\RepairSystemSettingMapper.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\services\RepairRecordService.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\services\impl\RepairEvaluateServiceImpl.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\services\impl\RepairRecordServiceImpl.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\AutoCode.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\model\pojo\RepairRefundRecord.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\model\pojo\RepairReceiving.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\services\impl\RepairSystemSettingServiceImpl.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\model\vo\repairRefundVo.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\services\impl\RepairTrackRecordServiceImpl.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\model\pojo\RepairClose.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\MybatisPlusApplication.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\model\vo\AutoDispatchUserVo.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\common\exception\EmsException.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\model\pojo\RepairArea.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\services\impl\RepairDispatchRecordServiceImpl.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\services\RepairSystemSettingService.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\common\utils\TimeExchange.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\config\MyBatisPlusConfig.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\mapper\RepairDispatchRecordMapper.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\model\pojo\RepairSchool.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\aop\LoginCheckAspect.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\common\utils\XmlUtil.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\model\pojo\RepairEvaluate.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\handle\NonStaticResourceHttpRequestHandler.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\model\result\Wx_user.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\common\result\ResponseStatusEnum.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\common\exception\EmsExceptionHandler.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\services\RepairShiftSettingsService.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\annotation\UserLoginCheck.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\services\impl\RepairSystemMessagesServiceImpl.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\common\utils\ValidateCode.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\services\RepairArticleBuildService.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\config\WxOpenidConfig.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\model\vo\timeVo.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\mapper\RepairShiftSettingsMapper.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\config\ScheduledConfig.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\services\impl\RepairShiftSettingsServiceImpl.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\main\java\com\repair\annotation\ControllerIsShow.java
-=======
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairEvaluateController.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairRecordController.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\enumModel\eFileType.java
@@ -461,4 +357,3 @@ D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repa
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\OfflineDetailVo.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\MobileRevertRequest.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\freezeRepairAdminRequest.java
->>>>>>> 1e8a464588113a3afc236ee3f004f164bb7128ff

target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst

@@ -1,2 +1,2 @@
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\test\java\com\repair\MybatisPlusApplicationTests.java
-D:\Bingo\Desktop\工作内容\报修系统\定时器方法\repair_backend\src\test\java\com\repair\WrapperTest.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\test\java\com\repair\WrapperTest.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\test\java\com\repair\MybatisPlusApplicationTests.java

target/surefire-reports/com.repair.MybatisPlusApplicationTests.txt

@@ -0,0 +1,4 @@
+-------------------------------------------------------------------------------
+Test set: com.repair.MybatisPlusApplicationTests
+-------------------------------------------------------------------------------
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 8.542 s - in com.repair.MybatisPlusApplicationTests

target/surefire-reports/com.repair.WrapperTest.txt

@@ -0,0 +1,4 @@
+-------------------------------------------------------------------------------
+Test set: com.repair.WrapperTest
+-------------------------------------------------------------------------------
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.776 s - in com.repair.WrapperTest