feat():U8同步设为定时任务，日生产工单定时任务同步状态

jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysDayPackageService.java

@@ -39,10 +39,10 @@ public interface YysDayPackageService extends IService<YysDayPackageEntity> {
     /**
      * 报工确认列表-app
      *
-     * @param groupName
+     * @param yysGroupEntity
      * @param request
      * @param requisitonMap
      * @return
      */
-    List<ConfirmResponse> queryList(String groupName, ConfirmRequest request, Map<String, List<YysRequisitionReportEntity>> requisitonMap);
+    List<ConfirmResponse> queryList(YysGroupEntity yysGroupEntity, ConfirmRequest request, Map<String, List<YysRequisitionReportEntity>> requisitonMap);
 }

jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysDayPackageServiceImpl.java

@@ -39,13 +39,17 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
 import java.text.SimpleDateFormat;
+
 import jnpf.util.*;
+
 import java.util.*;
+
 import jnpf.base.UserInfo;
 import jnpf.permission.entity.UserEntity;
+
 /**
- *
  * yysDayPackage
  * 版本： V3.5
  * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
@@ -70,7 +74,10 @@ public class YysDayPackageServiceImpl extends ServiceImpl<YysDayPackageMapper, Y
     public List<YysDayPackageEntity> getList(YysDayPackagePagination yysDayPackagePagination) {
         return getTypeList(yysDayPackagePagination, yysDayPackagePagination.getDataType());
     }
-    /** 列表查询 */
+
+    /**
+     * 列表查询
+     */
     @Override
     public List<YysDayPackageEntity> getTypeList(YysDayPackagePagination yysDayPackagePagination, String dataType) {
         String userId = userProvider.get().getUserId();
@@ -265,27 +272,34 @@ public class YysDayPackageServiceImpl extends ServiceImpl<YysDayPackageMapper, Y
             return this.list(yysDayPackageQueryWrapper);
         }
     }
+
     @Override
     public YysDayPackageEntity getInfo(String id) {
         QueryWrapper<YysDayPackageEntity> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(YysDayPackageEntity::getId, id);
         return this.getOne(queryWrapper);
     }
+
     @Override
     public void create(YysDayPackageEntity entity) {
         this.save(entity);
     }
+
     @Override
     public boolean update(String id, YysDayPackageEntity entity) {
         return this.updateById(entity);
     }
+
     @Override
     public void delete(YysDayPackageEntity entity) {
         if (entity != null) {
             this.removeById(entity.getId());
         }
     }
-    /** 验证表单唯一字段，正则，非空 i-0新增-1修改*/
+
+    /**
+     * 验证表单唯一字段，正则，非空 i-0新增-1修改
+     */
     @Override
     public String checkForm(YysDayPackageForm form, int i) {
         boolean isUp = StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
@@ -319,8 +333,10 @@ public class YysDayPackageServiceImpl extends ServiceImpl<YysDayPackageMapper, Y
         }
         return countRecover;
     }
+
     /**
      * 新增修改数据(事务回滚)
+     *
      * @param id
      * @param yysDayPackageForm
      * @return
@@ -345,7 +361,7 @@ public class YysDayPackageServiceImpl extends ServiceImpl<YysDayPackageMapper, Y
     }
 
     @Override
-    public List<ConfirmResponse> queryList(String groupName, ConfirmRequest request, Map<String, List<YysRequisitionReportEntity>> requisitonMap) {
+    public List<ConfirmResponse> queryList(YysGroupEntity yysGroupEntity, ConfirmRequest request, Map<String, List<YysRequisitionReportEntity>> requisitonMap) {
         //查询所有待确认的数据
         LambdaQueryWrapper<YysDayPackageEntity> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(YysDayPackageEntity::getIsConfirm, request.getFlag());
@@ -387,7 +403,8 @@ public class YysDayPackageServiceImpl extends ServiceImpl<YysDayPackageMapper, Y
                 List<YysDayPackageEntity> collected = entry.getValue().stream().sorted(Comparator.comparing(YysDayPackageEntity::getSort)).collect(Collectors.toList());
                 for (YysDayPackageEntity packageEntity : collected) {
                     ConfirmResponse confirmResponse = BeanUtil.copyProperties(packageEntity, ConfirmResponse.class);
-                    confirmResponse.setGroupName(groupName);
+                    confirmResponse.setGroupName(yysGroupEntity.getGroupName());
+                    confirmResponse.setGroupType(yysGroupEntity.getGroupType());
                     if (packMap.containsKey(packageEntity.getId())) {
                         confirmResponse.setPackageReportList(packMap.get(packageEntity.getId()));
                     }

jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysDayWorkServiceImpl.java

@@ -406,7 +406,7 @@ public class YysDayWorkServiceImpl extends ServiceImpl<YysDayWorkMapper, YysDayW
         List<YysRequisitionReportEntity> list = yysRequisitionReportService.list();
         Map<String, List<YysRequisitionReportEntity>> requisitonMap = list.stream().collect(Collectors.groupingBy(YysRequisitionReportEntity::getWorkId));
         if ("2".equals(yysGroupEntity.getGroupType())) {
-            return yysDayPackageService.queryList(yysGroupEntity.getGroupName(), request, requisitonMap);
+            return yysDayPackageService.queryList(yysGroupEntity, request, requisitonMap);
         }
         //查询所有待确认的数据
         LambdaQueryWrapper<YysDayWorkEntity> wrapper = new LambdaQueryWrapper<>();
@@ -455,6 +455,7 @@ public class YysDayWorkServiceImpl extends ServiceImpl<YysDayWorkMapper, YysDayW
                     ConfirmResponse confirmResponse = BeanUtil.copyProperties(dayWork, ConfirmResponse.class);
                     confirmResponse.setClassName(classCollect.get(dayWork.getPost()));
                     confirmResponse.setGroupName(yysGroupEntity.getGroupName());
+                    confirmResponse.setGroupType(yysGroupEntity.getGroupType());
                     if (prodMap.containsKey(dayWork.getId())) {
                         confirmResponse.setProdReportList(prodMap.get(dayWork.getId()));
                     }

jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysdaywork/ConfirmResponse.java

@@ -48,6 +48,11 @@ public class ConfirmResponse {
      */
     private String groupName;
 
+    /**
+     * 报工类型
+     */
+    private String groupType;
+
     /**
      * 班次名称
      */