Merge branch 'master' into feature/expert-library

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/req/AdjustmentListReq.java

@@ -28,11 +28,11 @@ public class AdjustmentListReq {
     private Integer projectYear;
 
     @ApiModelProperty("创建时间")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
     private LocalDateTime createOnMin;
 
     @ApiModelProperty("创建时间")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
     private LocalDateTime createOnMax;
 
     @ApiModelProperty("项目阶段")

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/req/ConstrctionPlanListReq.java

@@ -28,11 +28,11 @@ public class ConstrctionPlanListReq {
     private Integer projectYear;
 
     @ApiModelProperty("创建时间")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
     private LocalDateTime createOnMin;
 
     @ApiModelProperty("创建时间")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
     private LocalDateTime createOnMax;
 
 }

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/req/PrequalificationDeclaredListReq.java

@@ -28,11 +28,11 @@ public class PrequalificationDeclaredListReq {
     private Integer projectYear;
 
     @ApiModelProperty("创建时间")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
     private LocalDateTime createOnMin;
 
     @ApiModelProperty("创建时间")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
     private LocalDateTime createOnMax;
 
 }

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/req/ProjectListReq.java

@@ -62,11 +62,11 @@ public class ProjectListReq extends PagePo {
     private BigDecimal approveAmountMax;
 
     @ApiModelProperty("创建时间")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
     private LocalDateTime createOnMin;
 
     @ApiModelProperty("创建时间")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
     private LocalDateTime createOnMax;
 
     @ApiModelProperty("用户ID")

pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/InitProcessTask.java

@@ -108,7 +108,6 @@ public class InitProcessTask {
                 for(Integer processType : processTypeList){
                     String formName = ProjectProcessStageEnum.getDesc(processType);
                     WflowModelHistorysDto models = new WflowModelHistorysDto();
-                    models.setCreated(GregorianCalendar.getInstance().getTime());
 //                    models.setFormId("wf" + IdUtil.objectId());
                     models.setVersion(1);
                     models.setGroupId(1);

pmapi/src/main/java/com/ningdatech/pmapi/sys/controller/RoleController.java

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.Assert;
 import com.ningdatech.basic.model.PageVo;
 import com.ningdatech.log.annotation.WebLog;
+import com.ningdatech.pmapi.common.util.BizUtils;
 import com.ningdatech.pmapi.sys.model.entity.Role;
 import com.ningdatech.pmapi.sys.model.req.RolePageReq;
 import com.ningdatech.pmapi.sys.model.dto.RoleSaveDTO;
@@ -60,6 +61,7 @@ public class RoleController {
         Role role = roleService.getById(id);
         Assert.notNull(role, "角色不存在");
         RoleVO query = BeanUtil.toBean(role, RoleVO.class);
+        query.setManageRoleIdList(BizUtils.splitToLong(role.getManageRoleIds()));
         // 菜单
         roleManage.buildMenu(query);
         return query;

pmapi/src/main/java/com/ningdatech/pmapi/sys/model/vo/RoleVO.java

@@ -37,6 +37,9 @@ public class RoleVO extends BaseEntity {
     @ApiModelProperty(value = "名称")
     private String name;
 
+    @ApiModelProperty("管理角色ID")
+    private List<Long> manageRoleIdList;
+
     /**
      * 描述
      */

pmapi/src/main/java/com/ningdatech/pmapi/user/entity/UserInfo.java

@@ -1,5 +1,7 @@
 package com.ningdatech.pmapi.user.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
@@ -28,6 +30,7 @@ public class UserInfo implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     private LocalDateTime createOn;

pmapi/src/main/java/com/ningdatech/pmapi/user/manage/UserAuthLoginManage.java

@@ -65,7 +65,7 @@ public class UserAuthLoginManage {
      */
     public UserFullInfoDTO queryUserInfoInPasswordAuth(String username) {
         // TODO 目前账号密码登陆测试使用 强制用户登录 userId 1L
-        UserInfo userInfo = iUserInfoService.getById(2L);
+        UserInfo userInfo = iUserInfoService.getById(username);
         if (Objects.isNull(userInfo)) {
             return null;
         }

pmapi/src/test/java/com/ningdatech/pmapi/sys/service/IMenuServiceTest.java

@@ -6,6 +6,7 @@ import cn.hutool.db.Db;
 import cn.hutool.db.Entity;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ningdatech.pmapi.AppTests;
 import com.ningdatech.pmapi.sys.model.entity.Menu;
 import com.ningdatech.pmapi.sys.model.entity.Role;
@@ -71,11 +72,12 @@ class IMenuServiceTest extends AppTests {
 
     @Test
     public void initMenu() {
-        menuService.remove(null);
-        roleMenuService.remove(null);
-        String str = FileUtil.readString("/Users/wendy/Desktop/long_text_2023-02-13-15-28-42.txt", "UTF-8");
-        List<JSONObject> obj = JSONUtil.toList(str, JSONObject.class);
-        save(obj, 0);
+        // menuService.remove(null);
+        roleMenuService.remove(Wrappers.lambdaQuery(RoleMenu.class)
+                .eq(RoleMenu::getRoleId,1));
+        // String str = FileUtil.readString("/Users/wendy/Desktop/long_text_2023-02-13-15-28-42.txt", "UTF-8");
+        // List<JSONObject> obj = JSONUtil.toList(str, JSONObject.class);
+        // save(obj, 0);
         menuService.list().forEach(w -> {
             roleMenuService.save(new RoleMenu() {{
                 setRoleId(1L);