问题处理

hx-account/src/main/java/com/fjhx/account/service/account/impl/AccountRunningWaterServiceImpl.java

@@ -32,9 +32,11 @@ import com.fjhx.tenant.entity.dict.dto.DictTenantDataSelectDto;
 import com.fjhx.tenant.entity.dict.vo.DictTenantDataVo;
 import com.fjhx.tenant.service.dict.DictTenantDataService;
 import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.service.ISysDeptService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -72,6 +74,8 @@ public class AccountRunningWaterServiceImpl extends ServiceImpl<AccountRunningWa
 
     @Autowired
     private AccountService accountService;
+    @Autowired
+    private ISysDeptService deptService;
 
 
     /**
@@ -143,10 +147,19 @@ public class AccountRunningWaterServiceImpl extends ServiceImpl<AccountRunningWa
         QueryWrapper<Object> wrapper = getPageWrapper(dto);
         Page<AccountRunningWaterVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         List<AccountRunningWaterVo> records = page.getRecords();
-        //赋值归属公司名称
-        corporationService.attributeAssign(records, AccountRunningWaterVo::getCorporationId, (item, corporation) -> {
-            item.setCorporationName(corporation.getName());
-        });
+//        //赋值归属公司名称
+//        corporationService.attributeAssign(records, AccountRunningWaterVo::getCorporationId, (item, corporation) -> {
+//            item.setCorporationName(corporation.getName());
+//        });
+
+        // 查询部门信息
+        List<SysDept> sysDeptList = deptService.list();
+        Map<Long, String> sysDeptMap = sysDeptList.stream().collect(Collectors.toMap(SysDept::getDeptId, SysDept::getDeptName));
+
+        for (AccountRunningWaterVo record : records) {
+            record.setCorporationName(sysDeptMap.get(record.getCompanyId()));
+        }
+
         return page;
     }
 

hx-account/src/main/resources/mapper/account/AccountRunningWaterMapper.xml

@@ -10,8 +10,8 @@
                t2.contractCodes
         FROM account_running_water arw
                  LEFT JOIN account_management am ON arw.account_management_id = am.id
-                 LEFT JOIN (SELECT GROUP_CONCAT(t1.contractCode SEPARATOR '，') AS contractCodes,
-                                   GROUP_CONCAT(t1.contractId SEPARATOR '，')   AS contractIds,
+                 LEFT JOIN (SELECT GROUP_CONCAT(t1.contractCode) AS contractCodes,
+                                   GROUP_CONCAT(t1.contractId)   AS contractIds,
                                    t1.accountRunningWaterId
                             FROM ((--#到账认领
                                       SELECT c.`code`       AS contractCode,

hx-mes/src/main/java/com/fjhx/mes/service/production/impl/ProduceOrderDetailServiceImpl.java

@@ -363,6 +363,8 @@ public class ProduceOrderDetailServiceImpl extends ServiceImpl<ProduceOrderDetai
 
     @Override
     public JSONObject taskCount(ProduceOrderDetailSelectDto dto) {
+        dto.setIsScheduling(null);
+
         //完成任务查询
         ProduceOrderDetailSelectDto completedCountDto = BeanUtil.copyProperties(dto, ProduceOrderDetailSelectDto.class);
         completedCountDto.setProduceStatus("2,5,10");

hx-mes/src/main/resources/mapper/production/ProduceOrderDetailMapper.xml

@@ -61,17 +61,19 @@
 
     <select id="getProcessesScheduling"
             resultType="com.fjhx.mes.entity.production.vo.ProductionSchedulingVo">
-        SELECT pp.id                 AS processesId,
-               pp.`name`             AS processesName,
-               count(DISTINCT ps.id) AS quantity
+        SELECT pp.id AS processesId,
+        pp.`name` AS processesName,
+        count(DISTINCT ps.id) AS quantity
         FROM production_processes pp
-                 LEFT JOIN (select ps.id, ps.processes_id, ps.scheduling_date
-                            from production_scheduling ps
-                                     LEFT JOIN production_order_detail pod ON ps.task_id = pod.id
-                                     left join production_order po on pod.produce_order_id = po.id
-                                     LEFT JOIN contract c on po.contract_id = c.id
-                                ${ew.customSqlSegment}) ps ON ps.processes_id = pp.id
+        LEFT JOIN (select ps.id, ps.processes_id, ps.scheduling_date
+        from production_scheduling ps
+        LEFT JOIN production_order_detail pod ON ps.task_id = pod.id
+        left join production_order po on pod.produce_order_id = po.id
+        LEFT JOIN contract c on po.contract_id = c.id
+        ${ew.customSqlSegment}) ps ON ps.processes_id = pp.id
+        <if test="dayDate != null and dayDate != ''">
             AND ps.scheduling_date = #{dayDate}
+        </if>
         group by pp.id
     </select>
 </mapper>