20210422v1.0

pom.xml

@@ -19,7 +19,7 @@
 <!--        <module>pims</module>-->
 <!--        <module>health</module>-->
 <!--        <module>ct</module>-->
-<!--        <module>tcm</module>-->
+        <module>tcm</module>
 <!--        <module>ocr</module>-->
 
     </modules>

tall/src/main/resources/mapper_dao/TaskDetailDao.xml

@@ -657,6 +657,7 @@
         s.rec_status = 0
         and d.executor_role = #{userId}
         AND d.project_id = 0
+        order by s.begin_time
        )t
         LEFT JOIN
         t_pro_task_show ts on t.tDetailId = ts.task_detail_id and ts.rec_status = 0
@@ -717,9 +718,11 @@
             AND s.end_time >= #{startTime}
         </if>
         AND d.Level = 2
+        order by s.begin_time
         )t
         LEFT JOIN
         t_pro_task_show ts on t.tDetailId = ts.task_detail_id and ts.rec_status = 0
+
     </select>
 
 </mapper>

tcm/src/main/resources/mapper_dao/ReportCodeDao.xml

@@ -159,23 +159,7 @@
             and t.rec_status = 0
         ) c2 on c1.`code` = c2.parent_code
 
-        <if test="code==null or code==''">
-            <if test="nums == 0">
-                and (c1.`report_type`in (0,1))
-            </if>
-            <if test="nums == 14">
-                and (c1.`report_type`in (1))
-            </if>
-            <if test="nums == 90">
-                and (c1.`report_type`in (1))
-            </if>
-            <if test="nums == 180">
-                and (c1.`report_type`in (2))
-            </if>
-            <if test="nums == 365">
-                and (c1.`report_type`in (2))
-            </if>
-        </if>
+
 
     </select>
     <select id="queryCodeAll" resultType="java.lang.String">