合并分支 'dev_20230216' 到 'master'

Dev 20230216

查看合并请求 laws-foton-slrs/foton-slrs-system-rest!59

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java

@@ -4437,23 +4437,37 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
 
     @Override
     public ResponseMessage selectByIdAtt(String id) {
-
-        SarBussStandAttrInfo sarBussStandAttrInfo = sarBussStandAttrInfoService.selectByIdAtt(id);
         List<SarBussStandAttrInfo> sarBussStandAttrInfoList = new ArrayList<>();
-        if(sarBussStandAttrInfo!=null && StringUtils.isNotBlank(sarBussStandAttrInfo.getFbgbuss())){
+        if(StringUtils.isNotBlank(id)){
-            String[] split = sarBussStandAttrInfo.getFbgbuss().split(",");
+            String[] split = id.split(",");
-            List<String> asList = Arrays.asList(split);
+             if(split.length>0){
-            String fbgbussNmae = "";
+                 for (String idInfos : split){
-            for(String idInfo :asList){
+                     SarBussStandAttrInfo sarBussStandAttrInfo = sarBussStandAttrInfoService.selectByIdAtt(idInfos);
-                AttFileEO byId = iAttFileEOService.getFileInfo(idInfo);
+                     if(sarBussStandAttrInfo!=null && StringUtils.isNotBlank(sarBussStandAttrInfo.getFbgbuss())){
-                if(StringUtils.isNotBlank(fbgbussNmae)){
+                         String[] splitInfo = sarBussStandAttrInfo.getFbgbuss().split(",");
-                    fbgbussNmae = fbgbussNmae+","+byId.getOldFileName();
+                         String fbgbussName = "";
-                }else {
+                         String fbgBuss = "";
-                    fbgbussNmae = byId.getOldFileName();
+                         for(String idInfo :splitInfo){
-                }
+                             if(StringUtils.isNotBlank(idInfo)) {
-            }
+                                 AttFileEO byId = iAttFileEOService.getFileInfo(idInfo);
-            sarBussStandAttrInfo.setFbgbussNmae(fbgbussNmae);
+                                 if (StringUtils.isNotBlank(fbgbussName)) {
-            sarBussStandAttrInfoList.add(sarBussStandAttrInfo);
+                                     fbgbussName = fbgbussName + "," + byId.getOldFileName();
+                                 } else {
+                                     fbgbussName = byId.getOldFileName();
+                                 }
+                                 if (StringUtils.isNotBlank(fbgBuss)) {
+                                     fbgBuss = fbgBuss + "," + byId.getId();
+                                 } else {
+                                     fbgBuss = byId.getId();
+                                 }
+                             }
+                         }
+                         sarBussStandAttrInfo.setFbgbussNmae(fbgbussName);
+                         sarBussStandAttrInfo.setFbgbuss(fbgBuss);
+                         sarBussStandAttrInfoList.add(sarBussStandAttrInfo);
+                     }
+                 }
+             }
         }
         return Result.success(sarBussStandAttrInfoList);
     }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/service/impl/TsPositionServiceImpl.java

@@ -1,5 +1,6 @@
 package com.adc.da.slrs.sarPosition.service.impl;
 
+import com.adc.da.att.service.impl.AttFileEOServiceImpl;
 import com.adc.da.http.ResponseMessage;
 import com.adc.da.http.Result;
 import com.adc.da.slrs.sarPosition.entity.TsPosition;
@@ -7,12 +8,15 @@ import com.adc.da.slrs.sarPosition.dao.TsPositionDao;
 import com.adc.da.slrs.sarPosition.entity.TsPositionRoleVO;
 import com.adc.da.slrs.sarPosition.service.ITsPositionService;
 import com.adc.da.slrs.sarRole.entity.TsRole;
+import com.adc.da.util.LoginUserUtil;
 import com.adc.da.utils.util.ListUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -34,6 +38,9 @@ import java.util.Map;
  */
 @Service
 public class TsPositionServiceImpl extends ServiceImpl<TsPositionDao, TsPosition> implements ITsPositionService {
+
+    private static final Logger logger = LoggerFactory.getLogger(AttFileEOServiceImpl.class);
+
     @Autowired
     private TsPositionDao tsPositionDao;
 
@@ -80,11 +87,13 @@ public class TsPositionServiceImpl extends ServiceImpl<TsPositionDao, TsPosition
         List<String> deleteIds=updateRoleIds.get("delete");
         TsPosition tsPosition = new TsPosition();
         UpdateWrapper<TsPosition> updateWrapper = new UpdateWrapper<>();
+        String userId = LoginUserUtil.getUserId();
         for(String id:insertIds){
             tsPositionDao.insertRole(tsPositionRoleVO.getPositionId(),id);
             updateWrapper.eq("id", tsPositionRoleVO.getPositionId());
             tsPosition.setOperateTime(new Timestamp(System.currentTimeMillis()));
             tsPosition.setOperator(tsPositionRoleVO.getOperator());
+            logger.info("执行本次更新角色的人员是：" + userId);
             baseMapper.update(tsPosition,updateWrapper);
         }
         for(String id:deleteIds){
@@ -92,6 +101,7 @@ public class TsPositionServiceImpl extends ServiceImpl<TsPositionDao, TsPosition
             updateWrapper.eq("id", tsPositionRoleVO.getPositionId());
             tsPosition.setOperateTime(new Timestamp(System.currentTimeMillis()));
             tsPosition.setOperator(tsPositionRoleVO.getOperator());
+            logger.info("执行本次删除角色的人员是：" + userId);
             baseMapper.update(tsPosition,updateWrapper);
         }
         List<TsRole> roles=getRole(tsPositionRoleVO.getPositionId());
@@ -131,9 +141,11 @@ public class TsPositionServiceImpl extends ServiceImpl<TsPositionDao, TsPosition
         if(tsPositions!=null&&tsPositions.size()>0){
             return Result.error("该岗位已存在");
         }
+        String userId = LoginUserUtil.getUserId();
         //设置操作时间为当前系统时间
         tsPosition.setOperateTime(new Timestamp(System.currentTimeMillis()));
         tsPosition.setType("2");
+        logger.info("新增岗位的人员是：" + userId);
         tsPositionDao.insert(tsPosition);
         return Result.success();
     }
@@ -152,7 +164,9 @@ public class TsPositionServiceImpl extends ServiceImpl<TsPositionDao, TsPosition
         if(!oldPosition.getType().equals("2")){
             return Result.error("该岗位不可修改");
         }
+        String userId = LoginUserUtil.getUserId();
         tsPosition.setOperateTime(new Timestamp(System.currentTimeMillis()));
+        logger.info("修改岗位的人员是：" + userId);
         tsPositionDao.updateById(tsPosition);
         return Result.success();
     }
@@ -175,6 +189,8 @@ public class TsPositionServiceImpl extends ServiceImpl<TsPositionDao, TsPosition
         if(roleIds!=null&&roleIds.size()>0){
             return Result.error("该岗位已绑定角色，无法删除");
         }
+        String userId = LoginUserUtil.getUserId();
+        logger.info("删除岗位的人员是：" + userId);
         tsPositionDao.deleteById(positionId);
         return Result.success();
     }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java

@@ -152,9 +152,6 @@ public class EarlyWarningEOController extends BaseController<EarlyWarningEO> {
 //            List<StandWarningEO> exportExcel = earlyWarningEOService.getExportExcel(excelVO);
             List<WarningExportVO> exportExcel = earlyWarningEOService.getExportExcel(excelVO);
             for (WarningExportVO warningExportVO : exportExcel){
-                SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
-                String format = simpleDateFormat.format(warningExportVO.getPutTime());
-                warningExportVO.setPutTimeStr(format);
                 String condition = warningExportVO.getTermsConditions();
                 if (condition != null && condition.length() > 32001){
                     condition = condition.substring(0,32000);

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java

@@ -60,12 +60,12 @@ public class EarlyWarningEO extends BaseEntity {
     @TableField(exist = false)
     private String standName;
 
-//    @ExcelProperty(value = "发布日期",index = 6)
+    @ExcelProperty(value = "发布日期",index = 6)
-//    @ColumnWidth(20)
+    @ColumnWidth(20)
     @ApiModelProperty("发布日期")
     @TableField(exist = false)
     @DateTimeFormat(pattern="yyyy-MM-dd")
-    private Date putTime;
+    private String putTime;
 
     @ExcelIgnore
     @TableField(exist = false)

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/WarningExportVO.java

@@ -39,12 +39,4 @@ public class WarningExportVO extends EarlyWarningEO {
     @ApiModelProperty("适用车型展示")
     private String applyTypeShow;
 
-    @ExcelProperty(value = "发布日期",index = 6)
-    @ColumnWidth(20)
-    @ApiModelProperty("发布日期")
-    @TableField(exist = false)
-    @DateTimeFormat(pattern="yyyy-MM-dd")
-    private String putTimeStr;
-
-
 }