Merge branch 'develop_3' into 'develop_master'

Develop 3

See merge request LiuChao/foton-slrs-system-rest!381

adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/controller/WorkGroupController.java

@@ -57,7 +57,7 @@ public class WorkGroupController extends BaseController<WorkGroup> {
 
 
 
-    @ApiModelProperty("删除工作组")
+    @ApiModelProperty("批量删除工作组")
     @DeleteMapping
     public ResponseMessage deleteWorkGroup(String id){
         boolean delete = iWorkGroupService.delete(id);

adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/service/impl/WorkGroupServiceImpl.java

@@ -12,6 +12,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Arrays;
+import java.util.List;
+
 /**
  * <p>
  *  服务实现类
@@ -36,7 +39,8 @@ public class WorkGroupServiceImpl extends ServiceImpl<WorkGroupDao, WorkGroup> i
 
     @Override
     public boolean delete(String workGroupId) {
-        return this.removeById(workGroupId);
+        List<String> idList = Arrays.asList(workGroupId.split(","));
+        return this.removeByIds(idList);
     }
 
     @Override

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java

@@ -153,6 +153,9 @@ public class SarBussionessStand extends BaseEntity {
     @TableField(exist = false)
     private String menuParentId;
 
+    @TableField(exist = false)
+    private String textStatusBussShow;
+
     @TableField(exist = false)
     private String standStatusShow; // 标准状态下拉框   --单选
 

adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml

@@ -21,6 +21,7 @@
         <result column="stand_sort" property="standSort" />
         <result column="stand_year" property="standYear" />
         <result column="text_status_buss" property="textStatusBuss" />
+        <result column="text_status_buss_show" property="textStatusBussShow"/>
     </resultMap>
 
     <resultMap id="BaseResultMapExcel" type="com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand" >
@@ -748,12 +749,13 @@
 
     <!-- 根据id查询 SAR_BUSSIONESS_STAND 的详细信息-->
     <select id="selectStandardsInfoByKey" resultMap="BaseResultMap" parameterType="java.lang.String">
-        select <include refid="Base_Column_List_show" />
+        select <include refid="Base_Column_List_show" />,dictextstatus.DIC_TYPE_NAME as text_status_buss_show
         from SAR_BUSSIONESS_STAND
         left join TS_DICTYPE dicstandStatus ON ( dicstandStatus.dic_type_code = SAR_BUSSIONESS_STAND.TEXT_STATUS_BUSS AND dicstandStatus.dic_id IS NOT NULL and dicstandStatus.valid_flag = 0)
         left join TS_DICTYPE dicstandNature ON ( dicstandNature.dic_type_code = SAR_BUSSIONESS_STAND.STAND_NATURE AND dicstandNature.dic_id IS NOT NULL and dicstandNature.valid_flag = 0)
         left join TS_DICTYPE dicstandSort ON ( dicstandSort.dic_type_code = SAR_BUSSIONESS_STAND.STAND_SORT AND dicstandSort.dic_id IS NOT NULL and dicstandSort.valid_flag = 0)
         left join TS_DICTYPE dicapplyCountry ON ( dicapplyCountry.dic_type_code = SAR_BUSSIONESS_STAND.APPLY_COUNTRY AND dicapplyCountry.dic_id IS NOT NULL and dicapplyCountry.valid_flag = 0)
+        left join TS_DICTYPE dictextstatus ON ( dictextstatus.dic_type_code = SAR_BUSSIONESS_STAND.TEXT_STATUS_BUSS AND dicstandSort.dic_id IS NOT NULL and dictextstatus.valid_flag = 0)
         left join SAR_BUSS_STAND_MENU ON SAR_BUSSIONESS_STAND.id = SAR_BUSS_STAND_MENU.buss_stand_id
         left join TS_RESOURCE on SAR_BUSS_STAND_MENU.menu_id = TS_RESOURCE.id
         where SAR_BUSSIONESS_STAND.id = #{id}

adc-da-sys/src/main/java/com/adc/da/sys/controller/DicTypeEORestController.java

@@ -340,8 +340,10 @@ public class DicTypeEORestController extends BaseController<DicTypeEO> {
     @GetMapping("/getDicTypeListCode")
     //@RequiresPermissions("sys:dicType:getDicTypeListCode")
     public ResponseMessage<Map<String, Object>> getDicTypeListCode() throws Exception {
-        Map<String, Object> dicTypeEO = dicTypeEOService.getDicTypeListCode();
+
-        return Result.success(dicTypeEO);
+        return Result.success("1","hello");
+//        Map<String, Object> dicTypeEO = dicTypeEOService.getDicTypeListCode();
+//        return Result.success(dicTypeEO);
     }
 
     /**