[用户 清退] 修改接口

dev-file/src/main/java/com/tykj/dev/device/file/service/FilesUtil.java

+package com.tykj.dev.device.file.service;
+
+import com.tykj.dev.device.file.entity.FileRet;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * @author zjm
+ * @version 1.0.0
+ * @ClassName FilesUtil.java
+ * @Description 文件工具类
+ * @createTime 2021年01月08日 15:24:00
+ */
+public class FilesUtil {
+    public static List<FileRet> stringFileToList(String fileString){
+        List<FileRet> fileRetList=new ArrayList<>();
+        FileRet fileRet = new FileRet();
+        String [] fileRets = fileString.substring(3).split("<\\*>");
+        List<String> strings= Arrays.asList(fileRets);
+        strings.forEach(
+                file->{
+                    System.out.println(file);
+                    String [] files= file.split(",");
+                    fileRet.setName(files[0]);
+                    fileRet.setFilePath(files[1]);
+                    fileRet.setPreviewPath(files[2]);
+                    fileRetList.add(fileRet);
+                }
+        );
+        return fileRetList;
+    }
+
+    public static String stringFileToList(List<FileRet> fileRets){
+        StringBuffer fileString = new StringBuffer();
+       fileRets.forEach(
+               fileRet -> fileString.append("<*>").append(fileRet.getName())
+                       .append(",")
+                       .append(fileRet.getFilePath())
+                       .append(",")
+                       .append(fileRet.getPreviewPath())
+       );
+       return fileString.toString();
+    }
+    public static void main(String[] args) {
+        stringFileToList("<*>123123,123123,123123");
+        stringFileToList(stringFileToList("<*>123123,123123,123123"));
+    }
+
+}

dev-file/src/main/java/com/tykj/dev/device/file/service/UseReportFIleService.java

@@ -11,4 +11,5 @@ public interface UseReportFIleService {
     void findToFileService(WrodParameter wrodParameter, HttpServletResponse response, HttpServletRequest httpServletRequest) throws IOException;
 
     void download(String url, String name, HttpServletResponse response, HttpServletRequest httpServletRequest);
+
 }

dev-sendback/src/main/java/com/tykj/dev/device/sendback/entity/domain/DeviceRepel.java

+package com.tykj.dev.device.sendback.entity.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+import javax.persistence.*;
+import java.util.Date;
+
+/**
+ * @author zjm
+ * @version 1.0.0
+ * @ClassName DeviceRepel.java
+ * @Description DeviceRepel 清退业务id
+ * @createTime 2021年01月06日 20:02:00
+ */
+@Data
+@Entity
+@EntityListeners(AuditingEntityListener.class)
+@ApiModel("清退账单")
+public class DeviceRepel {
+    /**
+     * 数据id
+     */
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer id;
+
+    /**
+     * 类型集合多个列装id
+     * 页面类型
+     */
+    private String fielding;
+
+    /**
+     * 描述
+     */
+    private String describes;
+
+    /**
+     * 任务范围
+     * 字典值
+     */
+    private Integer taskScope;
+
+    /**
+     * 全省清退单
+     *  中办签字
+     */
+    private String fineName;
+
+    /**
+     * 单据rul
+     */
+    private String url;
+
+    @ApiModelProperty(value = "截至日期")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date time;
+}

dev-sendback/src/main/java/com/tykj/dev/device/sendback/entity/domain/DeviceRepelDetail.java

+package com.tykj.dev.device.sendback.entity.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.tykj.dev.device.library.subject.domin.DeviceLibrary;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.data.annotation.CreatedBy;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.annotation.LastModifiedBy;
+import org.springframework.data.annotation.LastModifiedDate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+import javax.persistence.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author zjm
+ * @version 1.0.0
+ * @ClassName DeviceRepel.java
+ * @Description DeviceRepel 清退业务id
+ * @createTime 2021年01月06日 20:02:00
+ */
+@Data
+@Entity
+@EntityListeners(AuditingEntityListener.class)
+@ApiModel("清退详情")
+public class DeviceRepelDetail {
+    /**
+     * 主键id
+     */
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @ApiModelProperty(name = "主键id")
+    private Integer id;
+
+    /**
+     * 账单id
+     */
+    @ApiModelProperty(value = "账单id")
+    private Integer repelId;
+
+    /**
+     * 申请文号
+     */
+    @ApiModelProperty(value = "申请文号")
+    private String applyNumber;
+    /**
+     * 批复文号
+     */
+    @ApiModelProperty(value = "批复文号")
+    private String replayNumber;
+    /**
+     * 发件单位
+     */
+    @ApiModelProperty(value = "发件单位")
+    private String sendUnit;
+    /**
+     * 收件单位
+     */
+    @ApiModelProperty(value = "收件单位")
+    private String receiveUnit;
+    /**
+     * 配发时间
+     */
+    @ApiModelProperty(value = "配发时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date sendTime;
+    /**
+     * 接收时间
+     */
+    @ApiModelProperty(value = "接收时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date receiveTime;
+    /**
+     * 发件方id(A岗位)
+     */
+    @ApiModelProperty(value = "发件方id(A岗位)")
+    private Integer sendUserAId;
+    /**
+     * 发件方id(B岗位)
+     */
+    @ApiModelProperty(value = "发件方id(B岗位)")
+    private Integer sendUserBId;
+    /**
+     * 收件方id(A岗位)
+     */
+    @ApiModelProperty(value = "收件方id(A岗位)")
+    private Integer receiveUserAId;
+    /**
+     * 收件方id(B岗位)
+     */
+    @ApiModelProperty(value = "收件方id(B岗位)")
+    private Integer receiveUserBId;
+    /**
+     * 出库附件文件名
+     */
+    @ApiModelProperty(value = "出库附件文件名")
+    private String fileName;
+    /**
+     * 出库附件文件地址URL
+     */
+    @ApiModelProperty(value = "出库附件文件地址URL")
+    private String fileUrl;
+    /**
+     * 账单文件名
+     */
+    @ApiModelProperty(value = "账单文件名")
+    private String billFileName;
+    /**
+     * 账单文件地址URL
+     */
+    @ApiModelProperty(value = "账单文件地址URL")
+    private String billFileUrl;
+    /**
+     * 退回状态(1:退回待审核,2:退回审核失败,3:退回中,4:退回接收待审核,5:退回接收审核失败,6:退回成功)
+     */
+    @ApiModelProperty(value = "退回状态(1:退回待审核,2:退回审核失败,3:退回中,4:退回接收待审核,5:退回接收审核失败,6:退回成功)")
+    private Integer sendBackStatus;
+    /**
+     * 退回装备数量
+     */
+    @ApiModelProperty(value = "退回装备数量")
+    private Integer sendBackCount;
+    /**
+     * 已出库装备数量
+     */
+    @ApiModelProperty(value = "已出库装备数量")
+    private Integer sendedCount;
+    /**
+     * 已接收装备数量
+     */
+    @ApiModelProperty(value = "已接收装备数量")
+    private Integer receiveCount;
+    /**
+     * 出库检查详情(装备主键id+核对结果(0缺失1无误3新增,字符x作为分隔符)),例如x10x21x32x,意为主键id为1的装备缺失,为2的无误,为3的不匹配
+     */
+    @ApiModelProperty(value = "出库检查详情(装备主键id+核对结果(0缺失1无误3新增,字符x作为分隔符)),例如x10x21x32x,意为主键id为1的装备缺失,为2的无误,为3的不匹配")
+    private String sendCheckDetail;
+    /**
+     * 出库检查结果(缺失数量x新增数量),例如1x1,意为缺失1台,新增一条
+     */
+    @ApiModelProperty(value = "出库检查结果(缺失数量x新增数量),例如1x1,意为缺失1台,新增一条")
+    private String sendCheckResult;
+    /**
+     * 接收方入库检查详情(装备主键id+核对结果(0缺失1无误3不匹配,字符x作为分隔符)),例如x10x21x32x,意为主键id为1的装备缺失,为2的无误,为3的不匹配
+     */
+    @ApiModelProperty(value = "接收方入库检查详情(装备主键id+核对结果(0缺失1无误3不匹配,字符x作为分隔符)),例如x10x21x32x,意为主键id为1的装备缺失,为2的无误,为3的不匹配")
+    private String receiveCheckDetail;
+    /**
+     * 接收方检查结果(缺失数量x新增数量),例如1x1,意为缺失1台,新增一条
+     */
+    @ApiModelProperty(value = "接收方检查结果(缺失数量x新增数量),例如1x1,意为缺失1台,新增一条")
+    private String receiveCheckResult;
+    /**
+     * Ǵ作为分隔符,维修装备的主键id加备注,例如x1Ǵ备注1Ǵx2Ǵ备注2Ǵx,意为id为1的装备在维修，备注为备注1,id为2的装备在维修，备注为备注2
+     */
+    @ApiModelProperty(value = "Ǵ作为分隔符,维修装备的主键id加备注,例如x1Ǵ备注1Ǵx2Ǵ备注2Ǵx,意为id为1的装备在维修，备注为备注1,id为2的装备在维修，备注为备注2")
+    private String repairDeviceDetail;
+    /**
+     * 创建用户id
+     */
+    @CreatedBy
+    @ApiModelProperty(value = "创建用户id")
+    private Integer createUserId;
+    /**
+     * 创建时间
+     */
+    @CreatedDate
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+    /**
+     * 更新用户id
+     */
+    @LastModifiedBy
+    @ApiModelProperty(value = "更新用户id")
+    private Integer updateUserId;
+    /**
+     * 更新时间
+     */
+    @LastModifiedDate
+    @ApiModelProperty(value = "更新时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date updateTime;
+    /**
+     * 删除标记(0:未删除，1:已删除)
+     */
+    @ApiModelProperty(value = "删除标记(0:未删除，1:已删除)")
+    private Integer deleteTag;
+
+
+    /****************czq**************/
+
+
+    @ApiModelProperty(value = "发件方名称(A岗位)")
+    private String sendUserAName;
+
+    @ApiModelProperty(value = "发件方名称(B岗位)")
+    private String sendUserBName;
+
+    @ApiModelProperty(value = "收件方名称(A岗位)")
+    private String receiveUserAName;
+
+    @ApiModelProperty(value = "收件方名称(B岗位)")
+    private String receiveUserBName;
+
+    @ApiModelProperty(value = "装备id")
+    private String deviceIds;
+
+    @ApiModelProperty(value = "签发人")
+    private String agent;
+
+    @Transient
+    @ApiModelProperty(value = "装备List")
+    private List<DeviceLibrary> deviceLibraryEntities =new ArrayList<>();
+
+    @ApiModelProperty(value = "不知道是什么的号码")
+    private String num;
+
+    @ApiModelProperty(value = "发件单位签章id")
+    private String leftSignatureId;
+
+    @ApiModelProperty(value = "收件单位签章id")
+    private String rightSignatureId;
+
+    @ApiModelProperty(value = "区块链RID",name = "recordId")
+    private String recordId;
+
+    /**
+     * 提交描述
+     */
+    @ApiModelProperty(value = "提交描述")
+    private String submitDescription;
+
+    /**
+     * 审核反馈
+     */
+    @ApiModelProperty(value = "审核反馈")
+    private String auditingFeedback;
+}

dev-sendback/src/main/java/com/tykj/dev/device/sendback/entity/domain/RepelTaskStatistical.java

+package com.tykj.dev.device.sendback.entity.domain;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.tykj.dev.device.sendback.entity.vo.ModelCount;
+import com.tykj.dev.misc.utils.JacksonUtil;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+import javax.persistence.Entity;
+import javax.persistence.EntityListeners;
+import javax.persistence.Id;
+import javax.persistence.Transient;
+import java.util.List;
+
+/**
+ * @author zjm
+ * @version 1.0.0
+ * @ClassName RepelTaskStatistical.java
+ * @Description TODO
+ * @createTime 2021年01月07日 09:35:00
+ */
+@Data
+@Entity
+@EntityListeners(AuditingEntityListener.class)
+@ApiModel("清退统计维护")
+public class RepelTaskStatistical {
+    /**
+     * 数据id
+     */
+    @Id
+    private  Integer id;
+
+    /**
+     * repelId
+     */
+
+    private Integer repelId;
+    /**
+     * 父类taskId
+     */
+    private Integer fatherTaskId;
+
+    /**
+     * taskId
+     */
+    private Integer taskId;
+
+    /**
+     * 任务状态
+     */
+    private Integer taskStatus;
+
+    /**
+     * 区域名称
+     */
+    private String  areaName;
+
+    /**
+     * 提交的型号和数量 json存储modelCount对象
+     */
+    private String  modelCount;
+
+    /**
+     * modelCount json转对象 不存数据库
+     */
+    @Transient
+    private List<ModelCount> modelCountList;
+
+    public RepelTaskStatistical toModelCountList(){
+        modelCountList= JacksonUtil.readValue(modelCount,new TypeReference<List<ModelCount>>() {
+        });
+        return  this;
+    }
+
+}

dev-sendback/src/main/java/com/tykj/dev/device/sendback/entity/vo/ModelCount.java

+package com.tykj.dev.device.sendback.entity.vo;
+
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+/**
+ * @author zjm
+ * @version 1.0.0
+ * @ClassName Model.java
+ * @Description TODO
+ * @createTime 2021年01月07日 09:41:00
+ */
+@Data
+@AllArgsConstructor
+@ApiModel("每个单位清退的类型-数量")
+public class ModelCount {
+    /**
+     * 型号
+     */
+    private String model;
+
+    /**
+     * 数量
+     */
+    private Integer count;
+}

dev-sendback/src/main/java/com/tykj/dev/device/sendback/repository/DeviceRepelDao.java

+package com.tykj.dev.device.sendback.repository;
+
+import com.tykj.dev.device.sendback.entity.domain.DeviceRepel;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+public interface DeviceRepelDao extends JpaRepository<DeviceRepel, Integer>, JpaSpecificationExecutor<DeviceRepel> {
+}

dev-sendback/src/main/java/com/tykj/dev/device/sendback/repository/DeviceRepelDetailDao.java

+package com.tykj.dev.device.sendback.repository;
+
+import com.tykj.dev.device.sendback.entity.domain.DeviceRepelDetail;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+public interface DeviceRepelDetailDao extends JpaRepository<DeviceRepelDetail, Integer>, JpaSpecificationExecutor<DeviceRepelDetail> {
+}

dev-sendback/src/main/java/com/tykj/dev/device/sendback/repository/RepelTaskStatisticalDao.java

+package com.tykj.dev.device.sendback.repository;
+
+import com.tykj.dev.device.sendback.entity.domain.RepelTaskStatistical;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+import java.util.List;
+
+public interface RepelTaskStatisticalDao extends JpaRepository<RepelTaskStatistical, Integer>, JpaSpecificationExecutor<RepelTaskStatistical> {
+    List<RepelTaskStatistical>  findAllByFatherTaskIdAndAndRepelId(Integer fatherId,Integer repelId);
+}

dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/DeviceRepelDetailService.java

+package com.tykj.dev.device.sendback.service;
+
+import com.tykj.dev.device.sendback.entity.domain.DeviceRepelDetail;
+
+public interface DeviceRepelDetailService {
+    /**
+     * 添加清退详情
+     * @return 清退详情对象
+     */
+    DeviceRepelDetail saveDeviceRepelDetail(DeviceRepelDetail deviceRepelDetail);
+
+    /**
+     * 根据清退详情id查询清退详情
+     * @param repelDetailId 清退详情id
+     * @return 详情对象
+     */
+    DeviceRepelDetail findDeviceRepelDetail(Integer repelDetailId);
+}

dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/DeviceRepelService.java

+package com.tykj.dev.device.sendback.service;
+
+import com.tykj.dev.device.sendback.entity.domain.DeviceRepel;
+
+public interface DeviceRepelService {
+    /**
+     * 添加账单
+     */
+    DeviceRepel saveDeviceRepel(DeviceRepel deviceRepel);
+
+    /**
+     * 根据账单id查询账单内容
+     */
+    DeviceRepel findDeviceRepel(Integer repelId);
+}

dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/RepelBusinessService.java

+package com.tykj.dev.device.sendback.service;
+
+import com.tykj.dev.device.sendback.entity.domain.DeviceRepel;
+
+import java.util.List;
+
+public interface RepelBusinessService {
+    /**
+     * 发起清退任务
+     */
+     void initiateRepel(DeviceRepel deviceRepel);
+
+    /**
+     * 市分解任务
+     */
+     void resolveRepel(List<Integer> devIds,Integer taskId);
+
+    /**
+     * 1。市提交装备提交装备信息，省进行确认
+     * 2。区县提交装备信息，市进行确认
+     * 修改repeltask的状态
+     * 以及修改账单的详情把装备写入到实体中
+     */
+
+     void resolveConfirm(Integer taskId);
+
+    /**
+     * 省市审核需要清退装备信息
+     * 省：同意则 市走出库流程，把装备送到省
+     * 市：同意则 区县出库流程，把装备送到市
+     * 不同意 统一添加备注
+     */
+    void resolveAudit(Integer taskId);
+
+    /**
+     * 清退装备待出库 装备出库任务
+     * 出库操作 上传出库单
+     */
+    void sendBackOutCheck(Integer taskId,Integer userId);
+
+
+    /**
+     * 上级清退装备入库
+     * todo
+     */
+    void storageDeviceRepel(Integer taskId);
+
+
+    /**
+     * 本级装备待清退提交
+     */
+    void oneselfRepel(Integer taskId,List<Integer> devIds);
+
+    /**
+     * 省清退任待办结 需要打印清退清单 签字上传
+     */
+    void provinceRepel(Integer taskId);
+
+    /**
+     *
+     */
+
+}

dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/RepelTaskStatisticalService.java

+package com.tykj.dev.device.sendback.service;
+
+import com.tykj.dev.device.sendback.entity.domain.RepelTaskStatistical;
+
+import java.util.List;
+
+public interface RepelTaskStatisticalService {
+
+    /**
+     * 添加清退任务统计数据
+     */
+    RepelTaskStatistical saveRepelTaskStatistical(RepelTaskStatistical repelTaskStatistical);
+
+    /**
+     * 根据父类taskId,账单id查询所有的下级任务完成情况
+     */
+    List<RepelTaskStatistical> findAllRepelTaskStatistical(Integer fatherTaskId,Integer repelId);
+
+}

dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/impl/DeviceRepelDetailServiceImpl.java

+package com.tykj.dev.device.sendback.service.impl;
+
+import com.tykj.dev.device.sendback.entity.domain.DeviceRepelDetail;
+import com.tykj.dev.device.sendback.repository.DeviceRepelDetailDao;
+import com.tykj.dev.device.sendback.service.DeviceRepelDetailService;
+import com.tykj.dev.misc.exception.ApiException;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+
+import java.util.Optional;
+
+/**
+ * @author zjm
+ * @version 1.0.0
+ * @ClassName DeviceRepelDetailServiceImpl.java
+ * @Description TODO
+ * @createTime 2021年01月07日 09:52:00
+ */
+@Service
+@Slf4j
+public class DeviceRepelDetailServiceImpl implements DeviceRepelDetailService {
+    @Autowired
+    DeviceRepelDetailDao deviceRepelDetailDao;
+
+
+    @Override
+    public DeviceRepelDetail saveDeviceRepelDetail(DeviceRepelDetail deviceRepelDetail) {
+        log.info("[清退] 详情添加成功");
+        return deviceRepelDetailDao.save(deviceRepelDetail);
+    }
+
+    @Override
+    public DeviceRepelDetail findDeviceRepelDetail(Integer repelDetailId) {
+        Optional<DeviceRepelDetail> optional = deviceRepelDetailDao.findById(repelDetailId);
+        if (optional.isPresent()){
+            return optional.get();
+        }else {
+            log.info("[清退] 详情查看错误，id没有找到{}",repelDetailId);
+            throw new ApiException(ResponseEntity.status(500).body("清退详情id没有找到:"+repelDetailId));
+        }
+    }
+}

dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/impl/DeviceRepelServiceImpl.java

+package com.tykj.dev.device.sendback.service.impl;
+
+import com.tykj.dev.device.sendback.entity.domain.DeviceRepel;
+import com.tykj.dev.device.sendback.repository.DeviceRepelDao;
+import com.tykj.dev.device.sendback.service.DeviceRepelService;
+import com.tykj.dev.misc.exception.ApiException;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+
+import java.util.Optional;
+
+/**
+ * @author zjm
+ * @version 1.0.0
+ * @ClassName DeviceRepelServiceImpl.java
+ * @Description TODO
+ * @createTime 2021年01月07日 09:52:00
+ */
+@Service
+@Slf4j
+public class DeviceRepelServiceImpl implements DeviceRepelService {
+    @Autowired
+    DeviceRepelDao deviceRepelDao;
+
+    @Override
+    public DeviceRepel saveDeviceRepel(DeviceRepel deviceRepel) {
+        return deviceRepelDao.save(deviceRepel);
+    }
+
+    @Override
+    public DeviceRepel findDeviceRepel(Integer repelId) {
+        Optional<DeviceRepel> optional = deviceRepelDao.findById(repelId);
+        if (optional.isPresent()){
+            return optional.get();
+        }else {
+            throw new ApiException(ResponseEntity.status(500).body("[清退] 未找到清退账单："+repelId));
+        }
+    }
+}

dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/impl/RepelBusinessServiceImpl.java

+package com.tykj.dev.device.sendback.service.impl;
+
+import com.tykj.dev.device.sendback.entity.domain.DeviceRepel;
+import com.tykj.dev.device.sendback.service.DeviceRepelDetailService;
+import com.tykj.dev.device.sendback.service.DeviceRepelService;
+import com.tykj.dev.device.sendback.service.RepelBusinessService;
+import com.tykj.dev.device.sendback.service.RepelTaskStatisticalService;
+import com.tykj.dev.device.task.service.TaskService;
+import org.checkerframework.checker.units.qual.A;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
+
+/**
+ * @author zjm
+ * @version 1.0.0
+ * @ClassName RepelBusinessServiceImpl.java
+ * @Description TODO
+ * @createTime 2021年01月07日 16:13:00
+ */
+public class RepelBusinessServiceImpl implements RepelBusinessService {
+    @Autowired
+    TaskService taskService;
+
+    @Autowired
+    DeviceRepelService deviceRepelService;
+
+    @Autowired
+    DeviceRepelDetailService deviceRepelDetailService;
+
+    @Autowired
+    RepelTaskStatisticalService repelTaskStatisticalService;
+
+    @Override
+    public void initiateRepel(DeviceRepel deviceRepel) {
+
+        //生成一个清退任务 省清退任务 类型为 清退统计17  16清退
+        //参照选择的范围给单位都发送 市清退任务待执行
+        //如果省本身有需要清退的型号，给省自己发起一个代办任务 本级装备待清退
+        //生成的任务放入统计表中 关联信息
+        //把清退账单存储到数据表中
+        //写入业务日志
+
+    }
+
+    @Override
+    public void resolveRepel(List<Integer> devIds, Integer taskId) {
+        // 市级选择需要清退的装备
+        // 按照装备给下面区县发起  区清退任务待执行
+        // 如果市本级有选中的设备，给市本级发起一个代办任务 本级装备待清退
+        // 生成的任务放入统计表中 关联信息
+        // 修改当前任务的状态 市清退任务待区县提交
+
+
+    }
+
+    @Override
+    public void resolveConfirm(Integer taskId) {
+        // 修改当前任务的状态  清退待提交装备审核
+        // 修改上级任务是否代办
+        // 修改账单详情信息，把装备加入
+        // 修改统计表中的数据信息 状态
+
+    }
+
+    @Override
+    public void resolveAudit(Integer taskId) {
+        // 修改当前任务的状态 清退提交装备待出库
+        // 修改上级任务是否代办
+        // 修改统计表中的数据信息 状态
+    }
+
+    @Override
+    public void sendBackOutCheck(Integer taskId, Integer userId) {
+        //把一些字段填写到对象中，保存入库
+        //把任务状态修改为 清退提交装备待接收
+
+    }
+
+    @Override
+    public void storageDeviceRepel(Integer taskId) {
+        //完结当前任务
+        //把任务状态修改为 清退提交装备已完成
+        //修改统计表中的数据信息 状态
+    }
+
+    @Override
+    public void oneselfRepel(Integer taskId, List<Integer> devIds) {
+        //完结当前任务
+        //修改统计表中的数据信息 状态
+        //把装备的状态都修改为待清退。
+    }
+
+    @Override
+    public void provinceRepel(Integer taskId) {
+        //需要上传清退单
+    }
+
+}

dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/impl/RepelTaskStatisticalServiceImpl.java

+package com.tykj.dev.device.sendback.service.impl;
+
+import com.tykj.dev.device.sendback.entity.domain.RepelTaskStatistical;
+import com.tykj.dev.device.sendback.repository.RepelTaskStatisticalDao;
+import com.tykj.dev.device.sendback.service.RepelTaskStatisticalService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @author zjm
+ * @version 1.0.0
+ * @ClassName RepelTaskStatisticalServiceImpl.java
+ * @Description TODO
+ * @createTime 2021年01月07日 09:53:00
+ */
+@Service
+@Slf4j
+public class RepelTaskStatisticalServiceImpl implements RepelTaskStatisticalService {
+    @Autowired
+    RepelTaskStatisticalDao repelTaskStatisticalDao;
+
+    @Override
+    public RepelTaskStatistical saveRepelTaskStatistical(RepelTaskStatistical repelTaskStatistical) {
+        return repelTaskStatisticalDao.save(repelTaskStatistical);
+    }
+
+    @Override
+    public List<RepelTaskStatistical> findAllRepelTaskStatistical(Integer fatherTaskId, Integer repelId) {
+        return repelTaskStatisticalDao.findAllByFatherTaskIdAndAndRepelId(fatherTaskId,repelId).stream().map(RepelTaskStatistical::toModelCountList).collect(Collectors.toList());
+    }
+}

dev-user/src/main/java/com/tykj/dev/device/user/subject/controller/UnitsController.java

@@ -41,8 +41,6 @@ public class UnitsController {
         return ResponseEntity.ok(unitsService.findListById(level));
     }
 
-
-
     @GetMapping(value = "/findAll")
     @ApiOperation(value = "查询所有单位", notes = "单位集合")
     public ResponseEntity findAlls() {
@@ -72,7 +70,7 @@ public class UnitsController {
     @GetMapping(value = "/find/units/superior/{unitsId}")
     @ApiOperation(value = "根据当前用户的单位ID查询下级单位对象", notes = "单位")
     public ResponseEntity findLastUnits1(@PathVariable Integer unitsId) {
-        return ResponseEntity.ok(unitsService.findSuperiorByunitsId(unitsId));
+        return ResponseEntity.ok(unitsService.findBySubordinate(unitsId));
     }
 
     @PostMapping(value = "/save")
@@ -84,14 +82,12 @@ public class UnitsController {
     @GetMapping("/page/{page}/{size}")
     @ApiOperation(value = "分页查询units对象", notes = "成功返回区域对象")
     public ResponseEntity selectPage(@PathVariable Integer page, @PathVariable Integer size){
-
         return ResponseEntity.ok(unitsService.selectPage(page,size));
     }
 
     @GetMapping("/train/list/{unitsId}")
     @ApiOperation(value = "清退时选择培训单位的接口", notes = "成功返回单位对象")
     public ResponseEntity selectPage( @PathVariable Integer unitsId){
-
         return ResponseEntity.ok(unitsService.findByUserIdUnitsTrainListVo(unitsId));
     }
 

dev-user/src/main/java/com/tykj/dev/device/user/subject/service/UserDataScreenService.java

-package com.tykj.dev.device.user.subject.service;
-
-import com.tykj.dev.device.user.base.ret.UserDateScreen;
-
-import java.util.List;
-
-public interface UserDataScreenService {
-    List<UserDateScreen> selectUserDataScreen();
-}