Merge remote-tracking branch 'origin/master'

science-admin/src/main/java/com/yiboshi/science/dao/ComUnitDAO.java

@@ -22,6 +22,8 @@ public interface ComUnitDAO extends BaseMapper<ComUnit>, BaseDAO<ComUnitQueryVO,
     ComUnitDTO getUnitById(String id);
     ComUnitDTO getUnitByTreeCode(String treeCode);
     List<ComUnitDTO> getList();
+    List<ComUnitDTO> getListByUnitName(String UnitName);
     DataStatisticsDTO getRegisterUnitCount(@Param("ew") Wrapper<ComProject> queryWrapper);
     DataStatisticsDTO getRegisterUnitCountByDay(@Param("ew") Wrapper<ComProject> queryWrapper);
+
 }

science-admin/src/main/java/com/yiboshi/science/param/dto/ComUnitDTO.java

@@ -24,7 +24,7 @@ import java.util.List;
 public class ComUnitDTO extends BaseDTO {
     /** 树编码 */
     @ApiModelProperty(value = "树编码", position = 1 , required = true)
-    @NotNull(message = "树编码不能为空")
+    // @NotNull(message = "树编码不能为空")
     @Length(max=50, message = "树编码不能大于50")
     private String treeCode;
     /** 单位名称 */

science-admin/src/main/java/com/yiboshi/science/rest/v1/ComUnitController.java

@@ -166,6 +166,21 @@ public class ComUnitController extends BaseController<ComUnitService, ComUnitQue
         return ResponseDataModel.ok(list);
     }
 
+    @ApiOperation(value = "获取单位信息", httpMethod = "GET", notes = "获取单位信息")
+    @GetMapping
+    @RequestMapping("/getListByUnitName")
+    @Anonymous
+    public ResponseDataModel<List<SelectListItem>> getListByUnitName(String UnitName) {
+        List<SelectListItem> list = new ArrayList<>();
+        List<ComUnitDTO> dtoList = comUnitService.getListByUnitName(UnitName);
+        dtoList.forEach((e) -> {
+            list.add(new SelectListItem(e.getUnitName(), e.getId(),"",true, true, null));
+        });
+        return ResponseDataModel.ok(list);
+    }
+
+
+
     @ApiOperation(value = "获取单位类型", httpMethod = "GET", notes = "获取单位类型")
     @GetMapping
     @RequestMapping("/getUnitType")

science-admin/src/main/java/com/yiboshi/science/service/ComUnitService.java

@@ -58,6 +58,14 @@ public interface ComUnitService extends BaseService<ComUnitQueryVO, ComUnitDTO,
      */
     List<ComUnitDTO> getListByType(Integer unitType);
 
+    /**
+     * 根据单位名称获取单位列表
+     * @param UnitName
+     * @return
+     */
+    List<ComUnitDTO> getListByUnitName(String UnitName);
+
+
     /**
      * 单位注册
      * @param unit

science-admin/src/main/java/com/yiboshi/science/service/impl/ComUnitServiceImpl.java

@@ -374,6 +374,13 @@ public class ComUnitServiceImpl extends BaseServiceImpl<ComUnitDAO, ComUnitQuery
         return list;
     }
 
+    public List<ComUnitDTO> getListByUnitName(String UnitName) {
+        List<ComUnitDTO> UnitList = comUnitDAO.getListByUnitName(UnitName);
+        return UnitList;
+    }
+
+
+
     public List<ComUnitDTO> getList() {
         List<ComUnitDTO> list = null;
         Object obj = redisUtils.get(RedisKey.UnitList);

science-admin/src/main/resources/mapper/ComUnitDAO.xml

@@ -31,6 +31,12 @@
         where a.tree_code = #{treeCode}
     </select>
 
+    <select id="getListByUnitName" parameterType="java.lang.String" resultType="com.yiboshi.science.param.dto.ComUnitDTO">
+        select a.*
+        from com_unit a
+        where a.unit_name = #{UnitName}
+    </select>
+
     <select id="getListByPage" resultType="com.yiboshi.science.param.dto.ComUnitDTO">
         select a.*, b.username, b.password, c.unit_name as upUnitName,d.name natureName
         from com_unit a