fix app create and update report

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/app/AppOrgWorkerController.java

@@ -73,7 +73,8 @@ public class AppOrgWorkerController {
     @GetMapping("/getOtherOrgList")
     @Operation(summary = "获得工位安排")
     public CommonResult<List<AppOrgWorkerVO>> getOtherPersonal(@Valid AppReportReqVO reqVO) {
-        OrgWorkerPageReqVO pageReqVO = new OrgWorkerPageReqVO().setOrgType(reqVO.getOrgType()).setGroupType(reqVO.getGroupType());
+        OrgWorkerPageReqVO pageReqVO = new OrgWorkerPageReqVO().setOrgType(reqVO.getOrgType())
+                .setGroupType(reqVO.getGroupType()).setWorkerId(reqVO.getUserId());
         pageReqVO.setWorkDate(DateUtils.getDateRange(reqVO.getReportDate()));
         List<OrgWorkerDO> orgWorkers = orgWorkerService.getOrgWorkerByReportResVo(pageReqVO);
         return success(appService.getOrgList(orgWorkers));
@@ -83,9 +84,8 @@ public class AppOrgWorkerController {
     @GetMapping("/getOtherPersonalUser")
     @Operation(summary = "获得用户列表")
     public CommonResult<List<AppOrgWorkerVO>> getOtherPersonalUser(@Valid AppReportReqVO reqVO) {
-
-        WorkTeamDO workTeamDO = new WorkTeamDO().setGroupType(reqVO.getGroupType().toString())
-                .setTeamType(reqVO.getOrgType());
+        WorkTeamDO workTeamDO = new WorkTeamDO().setTeamType(reqVO.getOrgType());
+        if(reqVO.getGroupType()!=null) workTeamDO.setGroupType(reqVO.getGroupType().toString());
         List<WorkTeamDO> workTeamDOList =workTeamService.getList(workTeamDO);
         List<Long> teamIds = workTeamDOList.stream().map(WorkTeamDO::getId).collect(Collectors.toList());
         List<WorkTeamDetailDO> doList = workTeamService.getDetailByWorkTeamIds(teamIds);

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/producereport/ViewReportUserDateSummary.java

@@ -0,0 +1,43 @@
+package cn.iocoder.yudao.module.mes.dal.dataobject.producereport;
+
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+import java.math.BigDecimal;
+
+/**
+ * 以每人每日为基础，汇总每人每日的成品总数和废品总数 DO
+ *
+ * @author 内蒙必硕
+ */
+@TableName("mes_view_report_user_date_summary")
+@KeySequence("mes_view_report_user_date_summary_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ViewReportUserDateSummary {
+
+    /**
+     * 工人
+     */
+    private Long userId;
+    /**
+     * 日期
+     */
+    private String reportDay;
+    /**
+     * 总数数量
+     */
+    private BigDecimal sumNumber;
+    /**
+     * 成品数量
+     */
+    private BigDecimal totalQualityNumber;
+    /**
+     * 废品数量
+     */
+    private BigDecimal totalWasteNumber;
+}

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/producereport/ViewReportUserDateMapper.java

@@ -0,0 +1,25 @@
+package cn.iocoder.yudao.module.mes.dal.mysql.producereport;
+
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.mes.dal.dataobject.producereport.ViewReportUserDateSummary;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 报工工人日期汇总 Mapper
+ *
+ * @author 内蒙必硕
+ */
+@Mapper
+public interface ViewReportUserDateMapper extends BaseMapperX<ViewReportUserDateSummary> {
+
+    default List<ViewReportUserDateSummary> selectBy(Long userId, String reportDay, String[]reportDays) {
+        return selectList(new LambdaQueryWrapperX<ViewReportUserDateSummary>()
+                .eqIfPresent(ViewReportUserDateSummary::getUserId, userId)
+                .eqIfPresent(ViewReportUserDateSummary::getReportDay, reportDay)
+                .betweenIfPresent(ViewReportUserDateSummary::getReportDay, reportDays)
+                .orderByDesc(ViewReportUserDateSummary::getReportDay));
+    }
+}

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/producereport/ProduceReportServiceImpl.java

@@ -82,7 +82,11 @@ public class ProduceReportServiceImpl implements ProduceReportService {
         validateProduceReportExists(updateReqVO.getId());
         // 更新
         ProduceReportDO updateObj = BeanUtils.toBean(updateReqVO, ProduceReportDO.class);
-        produceReportMapper.updateById(updateObj);
+        ProduceReportDO oldObj = produceReportMapper.selectById(updateObj.getId());
+        oldObj.setTotalTime(updateReqVO.getTotalTime());
+        oldObj.setReportTime(updateReqVO.getReportTime());
+        oldObj.setRemark(updateReqVO.getRemark());
+        produceReportMapper.updateById(oldObj);
 
         // 更新子表
         updateProduceReportDetailList(updateObj, updateReqVO.getProduceReportDetails());
@@ -157,10 +161,12 @@ public class ProduceReportServiceImpl implements ProduceReportService {
 
     private void updateProduceReportDetailList(ProduceReportDO reportDO, List<ProduceReportDetailDO> list) {
         deleteProduceReportDetailByReportId(reportDO.getId());
+        if(list==null ||list.size()==0)return;
 		list.forEach(o -> o.setId(null).setReportStatus(reportDO.getReportStatus())
                 .setReportDate(reportDO.getReportDate()).setGroupType(reportDO.getGroupType())
                 .setOrgId(reportDO.getOrgId()).setOrgType(reportDO.getOrgType())
                 .setUserId(reportDO.getUserId())
+                .setReportId(reportDO.getId())
                 .setUpdater(null).setUpdateTime(null)
         ); // 解决更新情况下：1）id 冲突；2）updateTime 不更新
         createProduceReportDetailList(reportDO, list);

yudao-server/src/main/resources/application.yaml

@@ -244,6 +244,7 @@ yudao:
       - iot_mqtt_record
       - mes_view_task_product_summary
       - mes_view_report_plan_summary
+      - mes_view_report_user_date_summary
   sms-code: # 短信验证码相关的配置项
     expire-times: 10m
     send-frequency: 1m