Browse Source

仓库报表

3254194295 2 years ago
parent
commit
6acfd02b34

+ 3 - 0
platform-dao/src/main/java/com/platform/dao/mapper/activiti/ActivitiUserModelMapper.java

@@ -40,4 +40,7 @@ public interface ActivitiUserModelMapper extends MyMapper<ActivitiUserModel> {
     ActivitiUserModelVO getVOById(String id);
 
     void updateBatch(List<ActivitiUserModel> list);
+
+    void updateById(ActivitiUserModelDTO activitiUserModelDTO);
+
 }

+ 19 - 0
platform-dao/src/main/resources/mapper/activiti/ActivitiUserModelMapper.xml

@@ -152,4 +152,23 @@
         and DEPLOYMENT_ID_ = #{deploymentId}
     </update>
 
+    <update id="updateById" parameterType="com.platform.dao.dto.activiti.ActivitiUserModelDTO">
+        update t_activiti_user_model
+        <set>
+            type=#{type},
+            role_id=#{roleId},
+            form_variable=#{formVariable},
+            assignee=#{assignee},
+            role_id_list=#{roleIdList},
+            remark=#{remark},
+            update_time=#{updateTime},
+            update_user_id=#{updateUserId},
+            update_user_name=#{updateUserName},
+        </set>
+        where id = #{id}
+    </update>
+
+
+
+
 </mapper>

+ 1 - 1
platform-rest/src/main/java/com/platform/rest/controller/activiti/ActivitiUserModelController.java

@@ -78,7 +78,7 @@ public class ActivitiUserModelController {
     @PutMapping("/{id}")
     @PreAuthorize("@pms.hasPermission('activiti-user-models-edit')")
     public R update(@PathVariable("id") String id, @Validated({UpdateGroup.class}) @RequestBody ActivitiUserModelDTO activitiUserModelDTO) {
-        activitiUserModelService.modModelByDTO(activitiUserModelDTO);
+        activitiUserModelService.updateActivitiUserModel(activitiUserModelDTO);
         return new R<>();
     }
 

+ 2 - 0
platform-service/src/main/java/com/platform/service/activiti/ActivitiUserModelService.java

@@ -46,4 +46,6 @@ public interface ActivitiUserModelService extends IBaseService<ActivitiUserModel
     // void modify(String modeId, String userId, List<ActivitiUserModel> list);
 
     void updateBatch(List<ActivitiUserModel> list);
+
+    void updateActivitiUserModel(ActivitiUserModelDTO activitiUserModelDTO);
 }

+ 22 - 1
platform-service/src/main/java/com/platform/service/activiti/impl/ActivitiUserModelServiceImpl.java

@@ -2,6 +2,10 @@ package com.platform.service.activiti.impl;
 
 import com.platform.common.bean.AbstractPageResultBean;
 import com.platform.common.exception.BusinessException;
+import com.platform.common.model.OauthUser;
+import com.platform.common.model.UserInfo;
+import com.platform.common.util.BeanConverterUtil;
+import com.platform.common.util.SecurityUtils;
 import com.platform.common.util.StringUtils;
 import com.platform.dao.bean.MyPage;
 import com.github.pagehelper.PageHelper;
@@ -35,6 +39,7 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -242,4 +247,20 @@ public class ActivitiUserModelServiceImpl extends BaseServiceImpl<ActivitiUserMo
     public void updateBatch(List<ActivitiUserModel> list) {
         mapper.updateBatch(list);
     }
-}
+
+    @Override
+    public void updateActivitiUserModel(ActivitiUserModelDTO activitiUserModelDTO) {
+        setUpdateUserInfo(activitiUserModelDTO);
+        mapper.updateById(activitiUserModelDTO);
+    }
+
+    public void setUpdateUserInfo(ActivitiUserModelDTO model) {
+        model.setUpdateTime(LocalDateTime.now());
+        OauthUser user = SecurityUtils.getUser();
+        if (user != null) {
+            UserInfo userInfo = user.getUserInfo();
+            model.setUpdateUserId(userInfo.getUserId());
+            model.setUpdateUserName(userInfo.getRealName());
+        }
+    }
+}