fetch:人员添加字段

2021-06-25 15:49:30 +08:00
parent 1398f34c1e
commit 209f43fe1a
12 changed files with 89 additions and 39 deletions
@@ -3,9 +3,9 @@
 # 数据库配置
 #=============================================
 spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver
-spring.datasource.url = jdbc:mysql://101.36.227.22:33050/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false
+spring.datasource.url = jdbc:mysql://localhost:3306/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false
 spring.datasource.username = root
-spring.datasource.password = 1q2w3e4r
+spring.datasource.password = Zxy20010202

 #==============================================
 # 应用设置
@@ -29,7 +29,7 @@ import java.util.List;
 */
@RestController
@Api(tags = "|机构管理|")
-@RequestMapping("/SarInstitution/institution")
+@RequestMapping("/api/SarInstitution/institution")
 public class TsInstitutionController extends BaseController<TsInstitution> {
    @Autowired
    private ITsInstitutionService tsInstitutionService;
@@ -61,6 +61,10 @@ public class SarMenu extends BaseEntity {
    @TableField("DISPLAY_SEQ")
    private Integer displaySeq;

+    @ApiModelProperty(value = "路径")
+    @TableField("HREF")
+    private String href;
+
    @ApiModelProperty(value = "是否有效")
    @TableField("VALID_FLAG")
    private Integer validFlag;
@@ -24,4 +24,11 @@ public interface ISarMenuService extends IService<SarMenu> {
    List<String> queryRoleMenuIdList(String sordDivide, String menuId) throws Exception;

    List<String> getChildMenuList(String menuId);
+
+    /**
+     * 通过ids查询menus
+     * @param menuIds:菜单ID
+     * @return List<SarMenu>
+     */
+    List<SarMenu> getMenusByIds(List<String> menuIds);
 }
@@ -152,4 +152,16 @@ public class SarMenuServiceImpl extends ServiceImpl<SarMenuDao, SarMenu> impleme
        }
        return menuIds;
    }
+
+    /**
+     * 通过ids查询menus
+     * @param menuIds:菜单ID
+     * @return List<SarMenu>
+     */
+    @Override
+    public List<SarMenu> getMenusByIds(List<String> menuIds) {
+        QueryWrapper<SarMenu> menuQueryWrapper=new QueryWrapper<>();
+        menuQueryWrapper.in("id",menuIds);
+        return dao.selectList(menuQueryWrapper);
+    }
 }
@@ -35,4 +35,12 @@ public class SarUserPersonalMenu extends BaseEntity {
    private String menuUrl;


+    public SarUserPersonalMenu(String menuName, String menuId, String menuUrl) {
+        this.menuName = menuName;
+        this.menuId = menuId;
+        this.menuUrl = menuUrl;
+    }
+
+    public SarUserPersonalMenu() {
+    }
 }
@@ -27,7 +27,7 @@ import java.util.List;
 */
@RestController
@Api(tags = "|岗位管理|")
-@RequestMapping("/sarPosition/position")
+@RequestMapping("/api/sarPosition/position")
 public class TsPositionController extends BaseController<TsPosition> {
    @Autowired
    private ITsPositionService tsPositionService;
@@ -29,7 +29,7 @@ import java.util.List;
 */
@RestController
@Api(tags = "|角色管理|")
-@RequestMapping("/sarRole/role")
+@RequestMapping("/api/sarRole/role")
 public class TsRoleController extends BaseController<TsRole> {
    @Autowired
    private ITsRoleService tsRoleService;
@@ -3,6 +3,7 @@ package com.adc.da.slrs.sarRole.service.impl;
 import com.adc.da.http.ResponseMessage;
 import com.adc.da.http.Result;
 import com.adc.da.slrs.sarMenu.entity.SarMenu;
+import com.adc.da.slrs.sarMenu.service.ISarMenuService;
 import com.adc.da.slrs.sarRole.entity.TsRole;
 import com.adc.da.slrs.sarRole.dao.TsRoleDao;
 import com.adc.da.slrs.sarRole.entity.TsRoleMenuVO;
@@ -29,6 +30,8 @@ import java.util.Map;
 public class TsRoleServiceImpl extends ServiceImpl<TsRoleDao, TsRole> implements ITsRoleService {
    @Autowired
    private TsRoleDao tsRoleDao;
+    @Autowired
+    private ISarMenuService sarMenuService;

    /**
     * 查询所有角色
@@ -161,6 +164,8 @@ public class TsRoleServiceImpl extends ServiceImpl<TsRoleDao, TsRole> implements
        for(String menuId:deleteIds){
            tsRoleDao.delMenu(tsRoleMenuVO.getRoleId(),menuId);
        }
+        //修改首页自定义目录
+//        List<SarMenu> menus=sarMenuService.getMenusByIds(tsRoleMenuVO.getMenuIds());
        return Result.success();
    }

@@ -34,6 +34,41 @@ public class SarStandUnqualified extends BaseEntity {

    private static final long serialVersionUID = 1L;

+    @ExcelProperty("标准编号")
+    @ApiModelProperty(value = "标准ID")
+    @TableField("STAND_ID")
+    private String standId;
+
+    @ExcelProperty("标准名称")
+    @ApiModelProperty(value = "标准名称")
+    @TableField("STAND_NAME")
+    private String standName;
+
+    @ExcelProperty("条款号")
+    @ApiModelProperty(value = "条款号")
+    @TableField("ITEMS_NUM")
+    private String itemsNum;
+
+    @ExcelProperty("条款名称")
+    @ApiModelProperty(value = "条款名称")
+    @TableField("ITEMS_NAME")
+    private String itemsName;
+
+    @ExcelProperty("产品线")
+    @ApiModelProperty(value = "产品线")
+    @TableField("PRODUCT_LINE")
+    private String productLine;
+
+    @ExcelProperty("责任部门")
+    @ApiModelProperty(value = "责任部门")
+    @TableField("RESPONSIBLE_UNIT")
+    private String responsibleUnit;
+
+    @ExcelProperty("项目名称")
+    @ApiModelProperty(value = "项目名称")
+    @TableField("PRODUCT_NAME")
+    private String productName;
+
    @ExcelProperty("创建部门")
    @ApiModelProperty(value = "创建部门")
    @TableField("CREATE_DEPT_ID")
@@ -70,6 +105,10 @@ public class SarStandUnqualified extends BaseEntity {
    @TableField("PLAN_CLOSE_TIME")
    private Timestamp planCloseTime;

+    @ApiModelProperty(value = "未符合原因")
+    @TableField("REASON")
+    private String reason;
+
    @ExcelProperty("质量工程师")
    @ApiModelProperty(value = "质量工程师")
    @TableField("QA_ENGINEER")
@@ -85,46 +124,13 @@ public class SarStandUnqualified extends BaseEntity {
    @TableField("DUTY_ENGINEER")
    private String dutyEngineer;

-    @ExcelProperty("责任部门")
-    @ApiModelProperty(value = "责任部门")
-    @TableField("RESPONSIBLE_UNIT")
-    private String responsibleUnit;

-    @ExcelProperty("项目名称")
-    @ApiModelProperty(value = "项目名称")
-    @TableField("PRODUCT_NAME")
-    private String productName;
-
-    @ExcelProperty("产品线")
-    @ApiModelProperty(value = "产品线")
-    @TableField("PRODUCT_LINE")
-    private String productLine;

    @ExcelProperty(value = "产品类型",converter = ProductTypeConverter.class)
    @ApiModelProperty(value = "产品类型（research为在研产品，product为在产产品）")
    @TableField("PRODUCT_TYPE")
    private String productType;

-    @ExcelProperty("条款名称")
-    @ApiModelProperty(value = "条款名称")
-    @TableField("ITEMS_NAME")
-    private String itemsName;
-
-    @ExcelProperty("条款号")
-    @ApiModelProperty(value = "条款号")
-    @TableField("ITEMS_NUM")
-    private String itemsNum;
-
-    @ExcelProperty("标准名称")
-    @ApiModelProperty(value = "标准名称")
-    @TableField("STAND_NAME")
-    private String standName;
-
-    @ExcelProperty("标准编号")
-    @ApiModelProperty(value = "标准ID")
-    @TableField("STAND_ID")
-    private String standId;
-
    @ExcelIgnore
    @ApiModelProperty(value = "主键")
    @TableId("ID")
@@ -25,7 +25,7 @@ import com.adc.da.base.web.BaseController;
 */
@RestController
@Api(tags = "|人员管理|")
-@RequestMapping("/sarUser/user")
+@RequestMapping("/api/sarUser/user")
 public class TsUserController extends BaseController<TsUser> {
    @Autowired
    private ITsUserService tsUserService;
@@ -61,6 +61,14 @@ public class TsUser extends BaseEntity {
    @TableField("USER_SOURCE")
    private String userSource;

+    @ApiModelProperty(value = "用户手机号")
+    @TableField("PHONE")
+    private String phone;
+
+    @ApiModelProperty(value = "用户状态")
+    @TableField("STATE")
+    private String state;
+
    @ApiModelProperty(value = "用户邮箱")
    @TableField("EMAIL")
    private String email;