企标制修订计划模块

adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java

@@ -70,6 +70,9 @@ public class EsRevisePlan extends BasePage {
     @ApiModelProperty(value = "起草责任单位")
     private String unit;
 
+    @ApiModelProperty(value = "起草责任单位ID")
+    private String unitName;
+
 
 
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/dao/TsRoleDao.java

@@ -41,7 +41,7 @@ public interface TsRoleDao extends BaseMapper<TsRole> {
      * @param menuId：权限ID
      */
     @Insert("insert into ts_role_menu (role_id,menu_id) values (#{roleId},#{menuId})")
-    void addMenu(String roleId, String menuId);
+    void addMenu(@Param("roleId") String roleId, @Param("menuId") String menuId);
 
     /**
      * 删除权限

adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml

@@ -18,6 +18,7 @@
         draft_time,
         release_time,
         unit,
+        (select group_concat(ts_institution.name) from ts_institution where find_in_set(ts_institution.id,unit)) as unitName,
         (SELECT GROUP_CONCAT(UNAME) from ts_user WHERE find_in_set(USID,drafter) ) as drafterName,
         (SELECT GROUP_CONCAT(UNAME) from ts_user WHERE find_in_set(USID,res_person) ) as res_personName,
         (SELECT GROUP_CONCAT(UNAME) from ts_user WHERE find_in_set(USID,wg_leader) ) as wg_leaderName