提交

src/main/java/cn/ezhizao/project/business/company/controller/BizCompanyController.java

@@ -67,7 +67,6 @@ public class BizCompanyController extends BaseController
     /**
      * 查询company列表
      */
-    @PreAuthorize("@ss.hasPermi('business:company:list')")
     @GetMapping("/list")
     public TableDataInfo list(BizCompany bizCompany) throws NoSuchFieldException, IllegalAccessException
     {

src/main/java/cn/ezhizao/project/business/order/service/impl/BizArchiveInputServiceImpl.java

@@ -533,8 +533,9 @@ public class BizArchiveInputServiceImpl extends ServiceImpl<BizArchiveInputMappe
                         Integer monthNun = l.getDetails().stream().mapToInt(v -> v.getServiceNum() + v.getFreeNum()).sum();
                         DateTime startDate = DateTime.of(l.getStartMonth());
                         DateTime endDate = startDate.offsetNew(DateField.MONTH, monthNun - 1);
-                        // 假设结束月小于完成月
-                        if (records.stream().noneMatch(v -> (v.getYear() + v.getMonth()).compareTo(endDate.toString("yyyyMM")) >= 0)) {
+                        // 已完成月小于结束月才会不停工单只修改完成时间。假设完成月大于剩余的结束月则直接停止。
+                        // 一次都没完成的话，也要停止。
+                        if (records.stream().anyMatch(v -> (v.getYear() + v.getMonth()).compareTo(endDate.toString("yyyyMM")) >= 0) || records.isEmpty()) {
                             // 停止工单
                             l.setIsStop(1);
                         } else {

src/main/java/cn/ezhizao/project/system/controller/SysUserController.java

@@ -60,7 +60,7 @@ public class SysUserController extends BaseController
     /**
      * 获取用户列表
      */
-    @PreAuthorize("@ss.hasPermi('system:user:list')")
+
     @GetMapping("/list")
     public TableDataInfo list(SysUser user) throws NoSuchFieldException, IllegalAccessException {
         startPage();

src/main/resources/mybatis/business/BizWorkOrderMapper.xml

@@ -6,6 +6,13 @@
 
     <resultMap type="cn.ezhizao.project.business.workOrder.domain.BizWorkOrder" id="BizWorkOrderResult">
         <id column="id" property="id"/>
+        <result column="company_id" jdbcType="BIGINT" property="companyId"/>
+        <collection property="records"   select="getRecords" column="id"/>
+    </resultMap>
+
+    <resultMap type="cn.ezhizao.project.business.workOrder.domain.BizWorkOrderRecord"
+               id="BizWorkOrderRecordResult">
+        <id column="id" property="id"/>
     </resultMap>
 
     <select id="getList" parameterType="BizWorkOrder" resultMap="BizWorkOrderResult">
@@ -62,6 +69,10 @@
         </trim>
     </select>
 
+    <select id="getRecords" resultMap="BizWorkOrderRecordResult">
+        SELECT * FROM biz_work_order_record WHERE deleted = 0 AND work_order_id = #{id}
+    </select>
+
     <select id="getIndexList" parameterType="BizWorkOrder" resultMap="BizWorkOrderResult">
         SELECT t1.*,t2.name as company_name, t2.social_credit_code, t3.name as task_type_name, t4.name as
         task_type_detail_name, t5.nick_name as service_name, t2.is_zero

src/main/resources/mybatis/system/SysFileStorageMapper.xml

@@ -29,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="masterTableName != null">
                 master_table_name  = #{masterTableName} AND
             </if>
-            <if test="id != null">
+            <if test="master_id != null">
                 master_id = #{masterId} AND
             </if>
        <!-- 删除条件为其他外键可以在这里加 -->