Merge remote-tracking branch 'origin/master' into prod

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/duty/entity/ImsDutyMainPersonEntity.java

@@ -1,6 +1,5 @@
 package com.hnac.hzims.operational.duty.entity;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -65,7 +64,6 @@ public class ImsDutyMainPersonEntity extends TenantEntity {
 	/**
 	 * 值班班组名称
 	 */
-	@TableField(exist=false)
 	@ApiModelProperty(value = "值班班组名称")
 	private String dutyGroupName;
 	/**

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/feign/IAccessTaskClient.java

@@ -15,7 +15,6 @@ import org.springframework.web.bind.annotation.RequestParam;
 /**
  * @author hx
  */
-@Repository
 @FeignClient(
 	value = OperationalConstants.APP_NAME
 )

hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/mapper/ImsDutyMainMapper.java

@@ -1,10 +1,9 @@
 package com.hnac.hzims.operational.duty.mapper;
 
+import com.hnac.hzims.operational.duty.entity.ImsDutyMainEntity;
 import com.hnac.hzims.operational.duty.vo.*;
-import io.swagger.annotations.Api;
 import org.apache.ibatis.annotations.Param;
 import org.springblade.core.datascope.annotation.UserDataAuth;
-import com.hnac.hzims.operational.duty.entity.ImsDutyMainEntity;
 import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper;
 
 import java.util.List;
@@ -40,6 +39,7 @@ public interface ImsDutyMainMapper extends UserDataScopeBaseMapper<ImsDutyMainEn
 
 	ImsDutyMainEntity selectMainByIdOne(Long id);
 
+	void deleteByUserId(List<Long> list);
 	void deleteDate(String date);
 
 	@UserDataAuth

hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/mapper/ImsDutyMainMapper.xml

@@ -47,7 +47,15 @@
             and id !=#{id}
         </if>
     </select>
-
+    <delete id="deleteByUserId" >
+        delete from hz_ims_duty_main where is_deleted = 0
+        <if test="list != null and list.size > 0">
+        and id in
+        <foreach collection="list" item="item" index="index" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </if>
+    </delete>
     <select id="selectByDateList" resultType="com.hnac.hzims.operational.duty.vo.ImsSchedulingVo">
         SELECT
         DM.ID AS id,

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/OfflineTicketServiceImpl.java

@@ -71,6 +71,7 @@ public class OfflineTicketServiceImpl extends BaseServiceImpl<WorkTicketInfoMapp
     public boolean invoicing(WorkTicketInfoDto dto) {
         WorkTicketInfoEntity ticketInfoEntity = BeanUtil.copy(dto,WorkTicketInfoEntity.class);
         ticketInfoEntity.setCode(this.getTicketCode(ticketInfoEntity.getType(),ticketInfoEntity.getSignageCode()));
+        ticketInfoEntity.setStatus(WorkTicketConstants.FirstWorkTicketStatusEnum.OFFLINE_OPERATE.getStatus());
         ticketInfoEntity.setFlowStatus(WorkTicketConstants.FirstWorkTicketStatusEnum.OFFLINE_OPERATE.getStatus());
         ticketInfoEntity.setFlowTaskName(WorkTicketConstants.FirstWorkTicketStatusEnum.OFFLINE_OPERATE.getDescription());
         String userName = this.getLicensorNameByDept(Long.parseLong(AuthUtil.getDeptId()));
@@ -105,6 +106,8 @@ public class OfflineTicketServiceImpl extends BaseServiceImpl<WorkTicketInfoMapp
         String userName = this.getLicensorNameByDept(Long.parseLong(AuthUtil.getDeptId()));
         LambdaUpdateWrapper<WorkTicketInfoEntity> updateWrapper = Wrappers.<WorkTicketInfoEntity>lambdaUpdate()
                 .set(WorkTicketInfoEntity::getStatus, WorkTicketConstants.FirstWorkTicketStatusEnum.OFFLINE_LICENSE.getStatus())
+                .set(WorkTicketInfoEntity::getFlowStatus, WorkTicketConstants.FirstWorkTicketStatusEnum.OFFLINE_LICENSE.getStatus())
+                .set(WorkTicketInfoEntity::getFlowTaskName, WorkTicketConstants.FirstWorkTicketStatusEnum.OFFLINE_LICENSE.getDescription())
                 .set(WorkTicketInfoEntity::getLicensor, AuthUtil.getUserId())
                 .set(WorkTicketInfoEntity::getLicenseTime, LocalDateTime.now())
                 .set(WorkTicketInfoEntity::getLicenseEndTime, dto.getLicenseEndTime())
@@ -134,6 +137,8 @@ public class OfflineTicketServiceImpl extends BaseServiceImpl<WorkTicketInfoMapp
         String userName = this.getLicensorNameByDept(Long.parseLong(AuthUtil.getDeptId()));
         LambdaUpdateWrapper<WorkTicketInfoEntity> updateWrapper = Wrappers.<WorkTicketInfoEntity>lambdaUpdate()
                 .set(WorkTicketInfoEntity::getStatus, WorkTicketConstants.FirstWorkTicketStatusEnum.OFFLINE_END.getStatus())
+                .set(WorkTicketInfoEntity::getFlowStatus, WorkTicketConstants.FirstWorkTicketStatusEnum.OFFLINE_END.getStatus())
+                .set(WorkTicketInfoEntity::getFlowTaskName, WorkTicketConstants.FirstWorkTicketStatusEnum.OFFLINE_END.getDescription())
                 .set(WorkTicketInfoEntity::getStepOperator, userName)
                 .set(WorkTicketInfoEntity::getNextStepOperator, null)
                 .eq(WorkTicketInfoEntity::getId, dto.getId());

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketInfoServiceImpl.java

@@ -983,6 +983,8 @@ public class WorkTicketInfoServiceImpl extends BaseServiceImpl<WorkTicketInfoMap
             User user = UserCache.getUser(workTicketInfo.getLicensor());
             workTicketInfo.setLicensorName(user == null ? null : user.getName());
         }
+        // 工作负责人名称
+        workTicketInfo.setPrincipalName(Optional.ofNullable(workTicketInfo.getPrincipalManual()).filter(StringUtil::isNotBlank).orElse(workTicketInfo.getPrincipalName()));
 
         // 负责值班负责人
         if (workTicketInfo.getWatchPrincipal() != null) {
@@ -1019,14 +1021,11 @@ public class WorkTicketInfoServiceImpl extends BaseServiceImpl<WorkTicketInfoMap
             if (workTicketInfo.getTotalPerson() == null) {
                 workTicketInfo.setTotalPerson(sb.toString().trim().split(",").length);
             }
-
-            //成员信息
-            if (workTicketInfo.getClassGroupMembersName() == null) {
-                workTicketInfo.setClassGroupMembersName(sb.toString().endsWith(",") ? sb.toString().substring(0, sb.length() - 1) : sb.toString());
-            }
         }
-
-
+        workTicketInfo.setClassGroupMembersName(Optional.ofNullable(workTicketInfo.getClassGroupMembersManual()).filter(StringUtil::isNotBlank).orElse(workTicketInfo.getClassGroupMembersName()));
+        if(Func.isNotEmpty(workTicketInfo.getClassGroupMembersManual())) {
+            workTicketInfo.setTotalPerson(workTicketInfo.getClassGroupMembersManual().split(",").length);
+        }
         //负责人名称
         if (workTicketInfo.getPrincipalName() == null && workTicketInfo.getPrincipal() != null) {
             User user = UserCache.getUser(workTicketInfo.getPrincipal());

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/wrapper/WorkTicketInfoWrapper.java

@@ -25,20 +25,16 @@ public class WorkTicketInfoWrapper extends BaseEntityWrapper<WorkTicketInfoEntit
 	@Override
 	public WorkTicketInfoVO entityVO(WorkTicketInfoEntity entity) {
 		WorkTicketInfoVO workTicketInfoVO = BeanUtil.copy(entity,WorkTicketInfoVO.class);
-		User creator = UserCache.getUser(workTicketInfoVO.getCreateUser());
-		User updater = UserCache.getUser(workTicketInfoVO.getUpdateUser());
-		workTicketInfoVO.setCreateUserName(Optional.ofNullable(creator).map(User::getName).orElse(null));
-		workTicketInfoVO.setUpdateUserName(Optional.ofNullable(updater).map(User::getName).orElse(null));
+		workTicketInfoVO.setCreateUserName(Optional.ofNullable(workTicketInfoVO.getCreateUser()).map(UserCache::getUser).map(User::getName).orElse(null));
+		workTicketInfoVO.setUpdateUserName(Optional.ofNullable(workTicketInfoVO.getUpdateUser()).map(UserCache::getUser).map(User::getName).orElse(null));
 		/*完善负责人、许可人名称*/
 		if(Func.isEmpty(workTicketInfoVO.getPrincipal())){
 			workTicketInfoVO.setPrincipalName(workTicketInfoVO.getPrincipalManual());
 		}
 		else{
-			User principal = UserCache.getUser(workTicketInfoVO.getPrincipal());
-			workTicketInfoVO.setPrincipalName(Optional.ofNullable(principal).map(User::getName).orElse(null));
+			workTicketInfoVO.setPrincipalName(Optional.ofNullable(workTicketInfoVO.getPrincipal()).map(UserCache::getUser).map(User::getName).orElse(null));
 		}
-		User licensor = UserCache.getUser(workTicketInfoVO.getLicensor());
-		workTicketInfoVO.setLicensorName(Optional.ofNullable(licensor).map(User::getName).orElse(null));
+		workTicketInfoVO.setLicensorName(Optional.ofNullable(workTicketInfoVO.getLicensor()).map(UserCache::getUser).map(User::getName).orElse(null));
 		if(Func.isNotEmpty(workTicketInfoVO.getClassGroupMembersManual())){
 			workTicketInfoVO.setClassGroupMembersName(workTicketInfoVO.getClassGroupMembersManual());
 		}