履职登记保存防区

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/dto/AppResumptionDataDto.java

@@ -3,6 +3,7 @@ package com.xunmei.core.resumption.dto;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.xunmei.core.resumption.domain.AppResumptionDataRemarkimg;
+import com.xunmei.core.resumption.vo.resumptionRegister.ResumptionDataProtectionVo;
 import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -67,6 +68,8 @@ public class AppResumptionDataDto {
     private String resRemark;
 
     //private List<AppResumptionDataImg> imgData;
+
+    private List<ResumptionDataProtectionVo> protectionVo;
    private List<AppResumptionDataRemarkimg> imgData;
 
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/service/ResumptionBusiness.java

@@ -1,5 +1,6 @@
 package com.xunmei.core.resumption.service;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
@@ -21,6 +22,7 @@ import com.xunmei.core.resumption.vo.resumptionRegister.ResumptionDataRemarkingV
 import com.xunmei.system.api.RemoteConfigService;
 import com.xunmei.system.api.model.LoginUser;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
@@ -495,11 +497,11 @@ public class ResumptionBusiness {
         //Resumption resumption = resumptionService.find(taskid);
         Resumption resumption = resumptionService.findOneByTaskIdAndDate(request);
         List<Map<String, Object>> arealsit = new ArrayList<>();
-        List<ResumptionPointVo> pointList = appRulePointService.findPointByRulePlan(resumption.getPlanId(),resumption.getId());
+        List<ResumptionPointVo> pointList = appRulePointService.findPointByRulePlan(resumption.getPlanId(), resumption.getId());
         Set<Long> nfcBindIdList = new HashSet<>();
         pointList.forEach(r -> {
             nfcBindIdList.add(r.getAreaid());
-            if(ObjectUtil.isNull(r.getPointdataid())){
+            if (ObjectUtil.isNull(r.getPointdataid())) {
                 r.setPointdataid(IDHelper.id());
             }
         });
@@ -629,6 +631,7 @@ public class ResumptionBusiness {
         final List<AppResumptionData> list = new ArrayList<>();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         sdf.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
+        List<CoreResumptionDataProtection> resumptionProtections = new ArrayList<>();
 //        List<AppResumptionTaskDataRemark> remarkDtoList = new ArrayList<>();
         for (AppResumptionDataDto appResumptionDataDto : resumptionDataList) {
             AppResumptionData data = new AppResumptionData();
@@ -664,9 +667,9 @@ public class ResumptionBusiness {
 //                }
                 List<AppResumptionDataRemarkimg> imgLista = appResumptionDataDto.getImgData();
                 //根据remark 删除图片
-                appResumptionTaskDataRemarkimgService.remove((new QueryWrapper<AppResumptionDataRemarkimg>())
-                        .lambda()
-                        .eq(AppResumptionDataRemarkimg::getResumptionDataId, data.getId()));
+//                appResumptionTaskDataRemarkimgService.remove((new QueryWrapper<AppResumptionDataRemarkimg>())
+//                        .lambda()
+//                        .eq(AppResumptionDataRemarkimg::getResumptionDataId, data.getId()));
                 if (imgLista.size() > 0) {
                     imgLista.forEach(r -> r.setId(IDHelper.id())
                             .setResumptionDataId(data.getId())
@@ -674,6 +677,14 @@ public class ResumptionBusiness {
                     appResumptionTaskDataRemarkimgService.saveBatch(imgLista);
                 }
             }
+            if (CollectionUtil.isNotEmpty(appResumptionDataDto.getProtectionVo())) {
+                List<CoreResumptionDataProtection> dataProtections = appResumptionDataDto.getProtectionVo().stream().map(p -> {
+                    CoreResumptionDataProtection cp = new CoreResumptionDataProtection();
+                    BeanUtils.copyProperties(p, cp);
+                    return cp;
+                }).collect(Collectors.toList());
+                resumptionProtections.addAll(dataProtections);
+            }
         }
         appResumptionDataService.saveBatch(list);
         //获取未提交的履职数据当未提交的履职数据为0时，修改履职任务为已完成
@@ -699,12 +710,16 @@ public class ResumptionBusiness {
         }
         //获取履职数据异常的数据个数
         int exceptionCount = (int) appResumptionDataService.count((new QueryWrapper<AppResumptionData>()).lambda().eq(AppResumptionData::getResumptionId, request.getResumptionId()).eq(AppResumptionData::getResValue, 1));
+        if(CollectionUtil.isNotEmpty(resumptionProtections)){
+            coreResumptionDataProtectionService.saveBatch(resumptionProtections);
+        }
         resumption.setExceptionCount(exceptionCount);
         resumption.setUpdateTime(time);
         resumption.setUpdateBy(user.getName());
 //        resumption.setModifiedName(user.getName());
         //resumptionService.save(resumption);
         resumptionService.updateResumption(resumption);
+
         //清除代办
 //        this.todoService.remove(resumption.getId());
         return result;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/service/impl/ResumptionRecordServiceImpl.java

@@ -272,7 +272,7 @@ public class ResumptionRecordServiceImpl extends ServiceImpl<ResumptionRecordMap
             List<AppResumptionDataInfoVo> dataInfoList = baseMapper.selectDataInfo(ruleItemId, resumptionId);
             info.setDataInfoList(dataInfoList);
         }
-        List<ResumptionDataProtectionVo> protectionVos= coreResumptionDataProtectionService.selectProtection(resumptionId);
+        List<ResumptionDataProtectionVo> protectionVos = coreResumptionDataProtectionService.selectProtection(resumptionId);
         final ArrayList<Long> list = new ArrayList<>();
         for (ResumptionRecordInfoVo infoVo : arrayList) {
             infoVo.getDataInfoList().stream().map(AppResumptionDataInfoVo::getDataId).forEach(list::add);
@@ -287,7 +287,8 @@ public class ResumptionRecordServiceImpl extends ServiceImpl<ResumptionRecordMap
                     final List<AppResumptionDataRemarkimg> imgList = taskDataRemarkimgList.stream().filter(appResumptionDataImg -> appResumptionDataImg.getResumptionDataId().equals(dataInfoVo.getDataId())).collect(Collectors.toList());
                     dataInfoVo.setAppResumptionDataImgList(imgList);
 
-
+                    List<ResumptionDataProtectionVo> dataProtectionVos = protectionVos.stream().filter(p -> ObjectUtil.equal(dataInfoVo.getDataId(), p.getResumptionDataId())).collect(Collectors.toList());
+                    dataInfoVo.setProtections(dataProtectionVos);
                 }
             }
         }

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysOrgMapper.xml

@@ -581,11 +581,11 @@
     <select id="getParentName" resultType="com.xunmei.common.core.vo.IdNameVo">
         select so.id,so.name,p.name as extra
         from sys_org so
-        left join sys_org p on so.parent_id=p.id
-        where id in
+        left join sys_org p on so.parent_id=p.id and p.deleted=0
+        where so.id in
         <foreach collection="ids" item="id" separator="," open="(" close=")">
             #{id}
         </foreach>
-        and so.deleted=0 and p.deleted=0
+        and so.deleted=0
     </select>
 </mapper>