9/24 现场管理bug优化1.0

src/main/java/com/glxp/api/controller/auth/SysWorkplaceController.java

@@ -113,6 +113,7 @@ public class SysWorkplaceController extends BaseController {
             if (CollUtil.isNotEmpty(collect)) {
                 request.setWorkPlaceIds(collect);
             }
+            request.setLimit(100);
         }
         List<SysWorkplaceResponse> page = sysWorkplaceService.filterList(request);
         List<DictDto> reList = page.stream().map(s -> {

src/main/java/com/glxp/api/res/basic/UserWorkResponse.java

@@ -79,4 +79,5 @@ public class UserWorkResponse {
 
 
 
+
 }

src/main/java/com/glxp/api/service/auth/SysWorkplaceService.java

@@ -66,15 +66,15 @@ public class SysWorkplaceService extends ServiceImpl<SysWorkplaceDao, SysWorkpla
 
     @Transactional(rollbackFor = Exception.class)
     public boolean updateWorkplace(SysWorkplace sysWorkplace) {
-        if (sysWorkplace.getWorkplaceStatus() == 0 ){
+//        if (sysWorkplace.getWorkplaceStatus() == 0 ){
-            //更改停用 判断是否含有工位类型
+//            //更改停用 判断是否含有业务类型
-            WorkBindBusTypeRequest request = new WorkBindBusTypeRequest();
+//            WorkBindBusTypeRequest request = new WorkBindBusTypeRequest();
-            request.setWorkplaceCode(sysWorkplace.getWorkplaceId());
+//            request.setWorkplaceCode(sysWorkplace.getWorkplaceId());
-            List<SysWorkplaceDocumentResponse> page = sysWorkplaceDocumentService.filterListByWorkplace(request);
+//            List<SysWorkplaceDocumentResponse> page = sysWorkplaceDocumentService.filterListByWorkplace(request);
-            if (page.size() >0 ){
+//            if (page.size() >0 ){
-                throw new JsonException(500,"当前工位已作业，请解绑之后暂停工位");
+//                throw new JsonException(500,"当前工位已作业，请解绑之后暂停工位");
-            }
+//            }
-        }
+//        }
         boolean b = this.updateById(sysWorkplace);
         if (!b){
             return false;

src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java

@@ -521,7 +521,10 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
                 collectOrder.setBusType(sysWorkplaceDocumentEntity.getDocumentTypeCode());
                 collectOrder.setOrderCirType(sysWorkplaceDocumentEntity.getOrderCirType());
                 BeanUtils.copyProperties(collectOrder, ioCollectOrderOrigin);
-                collectOrderOriginService.save(ioCollectOrderOrigin);
+                boolean save = collectOrderOriginService.save(ioCollectOrderOrigin);
+                if (!save){
+                    throw new JsonException(500,"charu cuowu ");
+                }
 
 
                 List<IoCollectOrderBiz> bizList = collectOrder.getBizList();

src/main/java/com/glxp/api/service/collect/IoCollectOriginService.java

@@ -167,7 +167,7 @@ public class IoCollectOriginService {
                     List<IoCollectOrderBizOrigin> ioCollectOrderBizOrigins = BeanCopyUtils.copyList(bizList, IoCollectOrderBizOrigin.class);
                     collectOrderBizOriginService.updateBatchById(ioCollectOrderBizOrigins);
                 }else {
-                    thrOrder.setTagStatus(0);
+                    thrOrder.setTagStatus(2);
                     collectOrderOriginService.updateById(thrOrder);
 
                     List<IoCollectOrderBizOrigin> ioCollectOrderBizOrigins = BeanCopyUtils.copyList(bizList, IoCollectOrderBizOrigin.class);
@@ -207,4 +207,4 @@ public class IoCollectOriginService {
         }
         return null;
     }
-}
+}

src/main/resources/mybatis/mapper/basic/BasicCollectUserMapper.xml

@@ -7,6 +7,7 @@
                sw.invCode,
                sw.workplaceId,
                sw.constituencies,
+               sw.remake,
                au.userName,
                au.employeeName,
                sw.createTime as createTime,

src/main/resources/mybatis/mapper/basic/SysWorkplaceDocumentDao.xml

@@ -10,11 +10,15 @@
                  left join auth_warehouse aw on aw.code = sys_workplace_document.invCode
                  left join basic_bussiness_type on sys_workplace_document.documentTypeCode = basic_bussiness_type.action
                  left join thr_bustype_origin on thr_bustype_origin.action = sys_workplace_document.documentTypeCode
-
+                 left join sys_workplace_bus on  sys_workplace_bus.busTypeCode = sys_workplace_document.documentTypeCode
+                 left join sys_workplace on  sys_workplace.workplaceId = sys_workplace_bus.workplaceCode
         <where>
             <if test="documentTypeCode != '' and documentTypeCode != null">
                 AND documentTypeCode = #{documentTypeCode}
             </if>
+            <if test="workplaceCode != '' and workplaceCode != null">
+                AND sys_workplace.workplaceId = #{workplaceCode}
+            </if>
             <if test="isPopular >= 0 and isPopular != null">
                 AND isPopular = #{isPopular}
             </if>
@@ -24,6 +28,7 @@
                     )
             </if>
         </where>
+        GROUP BY sys_workplace_document.documentTypeCode
         ORDER BY sys_workplace_document.number
     </select>
 

src/main/resources/mybatis/mapper/collect/IoCollectOrderBackupMapper.xml

@@ -119,12 +119,12 @@
             </if>
         <if test="startTime != null">
             <![CDATA[
-            and icob.updateTime >= DATE_FORMAT(#{startTime}, '%Y-%m-%d %H:%i:%S')
+            and icob.billTime >= DATE_FORMAT(#{startTime}, '%Y-%m-%d %H:%i:%S')
             ]]>
         </if>
         <if test="endTime != null">
             <![CDATA[
-            and icob.updateTime <= DATE_FORMAT(#{endTime}, '%Y-%m-%d %H:%i:%S')
+            and icob.billTime <= DATE_FORMAT(#{endTime}, '%Y-%m-%d %H:%i:%S')
             ]]>
         </if>
         </where>

src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml

@@ -130,6 +130,16 @@
             <if test="fromCorpName != '' and fromCorpName != null">
                 AND ico.fromCorpName LIKE concat('%', #{fromCorpName}, '%')
             </if>
+            <if test="startTime != null">
+                <![CDATA[
+            and ico.billTime >= DATE_FORMAT(#{startTime}, '%Y-%m-%d %H:%i:%S')
+            ]]>
+            </if>
+            <if test="endTime != null">
+                <![CDATA[
+            and ico.billTime <= DATE_FORMAT(#{endTime}, '%Y-%m-%d %H:%i:%S')
+            ]]>
+            </if>
         </where>
         GROUP BY
         ico.billNo