审批优化

platform-dao/src/main/java/com/platform/dao/entity/activiti/LocalAuditRecord.java

@@ -76,8 +76,14 @@ public class LocalAuditRecord implements Serializable {
 
     private LocalDateTime updateTime;
 
+    /**
+     * 借用作为状态
+     */
     private String updateUserId;
 
+    /**
+     * 借用作为申请人
+     */
     private String updateUserName;
 
     /**

platform-dao/src/main/resources/mapper/activiti/LocalAuditRecordMapper.xml

@@ -104,7 +104,7 @@
     </sql>
     <select id="selectList" parameterType="com.platform.dao.dto.activiti.LocalAuditRecordDTO"
             resultType="com.platform.dao.vo.query.activiti.LocalAuditRecordVO">
-        select store.*,data.status,data.created_user_name as userName from t_local_audit_record as store join t_custom_field_template_data data on store.target_id = data.id
+        select store.*,data.status,data.created_user_name as userName from t_local_audit_record as store left join t_custom_field_template_data data on store.target_id = data.id
         <where>
             <include refid="List_Condition"/>
         </where>

platform-service/src/main/java/com/platform/service/activiti/impl/LocalAuditRecordServiceImpl.java

@@ -3,6 +3,7 @@ package com.platform.service.activiti.impl;
 import com.github.pagehelper.PageHelper;
 import com.platform.common.bean.AbstractPageResultBean;
 import com.platform.common.util.SecurityUtils;
+import com.platform.common.util.StringUtils;
 import com.platform.dao.bean.MyPage;
 import com.platform.dao.dto.activiti.LocalAuditRecordDTO;
 import com.platform.dao.entity.activiti.LocalAuditRecord;
@@ -40,7 +41,16 @@ public class LocalAuditRecordServiceImpl extends BaseServiceImpl<LocalAuditRecor
     public AbstractPageResultBean<LocalAuditRecordVO> selectPageList(LocalAuditRecordDTO record, int pageNum, int pageSize) {
         PageHelper.startPage(pageNum, pageSize);
         record.setCreatedUserId(SecurityUtils.getUserInfo().getUserId());
-        return new MyPage(mapper.selectList(record));
+        AbstractPageResultBean<LocalAuditRecordVO> pageInfos = new MyPage(mapper.selectList(record));
+        if(pageInfos != null && pageInfos.getRows() != null){
+            for(LocalAuditRecordVO vo : pageInfos.getRows()){
+                if(vo.getStatus() == null){
+                    vo.setStatus(StringUtils.isBlank(vo.getUpdateUserId()) ? null : Integer.parseInt(vo.getUpdateUserId()));
+                    vo.setUserName(vo.getUpdateUserName());
+                }
+            }
+        }
+        return pageInfos;
     }
 
     @Override

platform-service/src/main/java/com/platform/service/business/impl/OutStoreFormActivitiServiceImpl.java

@@ -1,31 +1,22 @@
 package com.platform.service.business.impl;
 
-import com.alibaba.fastjson.JSONObject;
 import com.platform.activiti.dao.entity.ActAuditRequest;
 import com.platform.common.bean.AbstractPageResultBean;
+import com.platform.common.constant.CommonConstants;
 import com.platform.common.exception.BusinessException;
 import com.platform.common.model.UserInfo;
 import com.platform.common.util.IdGeneratorUtils;
-import com.platform.common.util.JsonUtils;
-import com.platform.dao.dto.activiti.SbScrapFormActiviti;
 import com.platform.dao.entity.activiti.LocalAuditRecord;
-import com.platform.dao.entity.customize.CustomFieldTemplateData;
-import com.platform.dao.entity.sb.SbInfo;
 import com.platform.dao.entity.store.OutStoreForm;
 import com.platform.dao.enums.ActivitiFormStatusEnum;
-import com.platform.dao.enums.CustomFieldTemplateDataStatusEnum;
 import com.platform.dao.enums.OutStoreStatusEnum;
-import com.platform.dao.enums.SbInfoStatusEnum;
 import com.platform.dao.mapper.activiti.LocalAuditRecordMapper;
-import com.platform.dao.mapper.customize.CustomFieldTemplateDataMapper;
-import com.platform.dao.mapper.sb.SbInfoMapper;
 import com.platform.dao.mapper.store.OutStoreFormMapper;
 import com.platform.dao.vo.query.customize.CustomFieldTemplateDataVO;
 import com.platform.service.customize.BaseFormCheckServiceAbstract;
 import com.platform.service.yongyou.YongyouService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
 
 /**
@@ -163,10 +154,12 @@ public class OutStoreFormActivitiServiceImpl extends BaseFormCheckServiceAbstrac
         record.setId(IdGeneratorUtils.getObjectId());
         record.setNo(outStoreForm.getOutNo());
         record.setProcessInstanceId(actAuditRequest.getProcessInstanceId());
-        record.setTargetCode(outStoreForm.getRemark());
+        record.setTargetCode(CommonConstants.OUT_STORE_BACK);
         record.setTargetId(actAuditRequest.getId());
         record.setSelf(user.getUserId().equals(outStoreForm.getCreatedUserId()) ? Boolean.TRUE : Boolean.FALSE);
         record.setFlag(result == 0 ? false : true);
+        record.setUpdateUserName(outStoreForm.getCreatedUserName()); // 申请人
+        record.setUpdateUserId(ActivitiFormStatusEnum.FINISH.getValue() + ""); // 审批状态
         localAuditRecordMapper.insertSelective(record);
     }
 }