Merge remote-tracking branch 'origin/master'

securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/dto/SelectDto.java

@@ -17,4 +17,5 @@ public class SelectDto {
 
     @ApiModelProperty(value = "1.变电 2线路")
     private String proType;
+
 }

securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/vo/SelectVo.java

@@ -24,4 +24,12 @@ public class SelectVo {
     @ApiModelProperty(value = "建管单位orgId")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private String orgId;
+
+    @ApiModelProperty(value = "班组长")
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    private String teamLeader;
+
+    @ApiModelProperty(value = "班组长手机号")
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    private String teamLeaderPhone;
 }

securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/SelectController.java

@@ -67,4 +67,10 @@ public class SelectController extends BaseController {
     public AjaxResult getTowerLists(SelectDto dto){
         return service.getTowerLists(dto);
     }
+
+    @ApiOperation(value = "班组下拉选")
+    @GetMapping("getTeamLists")
+    public AjaxResult getTeamLists(SelectDto dto){
+        return service.getTeamLists(dto);
+    }
 }

securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/ISelectMapper.java

@@ -79,6 +79,7 @@ public interface ISelectMapper {
 
     /**
      * 杆塔下拉选
+     *
      * @param dto
      * @return List<SelectVo>
      * @description
@@ -86,4 +87,14 @@ public interface ISelectMapper {
      * @date 2024/3/15 17:01
      */
     List<SelectVo> getTowerLists(SelectDto dto);
+
+    /**
+     * 班组下拉选
+     * @param dto
+     * @return List<SelectVo>
+     * @description
+     * @author cwchen
+     * @date 2024/3/18 13:26
+     */
+    List<SelectVo> getTeamLists(SelectDto dto);
 }

securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/ISelectService.java

@@ -75,6 +75,7 @@ public interface ISelectService {
 
     /**
      * 杆塔下拉选
+     *
      * @param dto
      * @return AjaxResult
      * @description
@@ -82,4 +83,14 @@ public interface ISelectService {
      * @date 2024/3/15 17:00
      */
     AjaxResult getTowerLists(SelectDto dto);
+
+    /**
+     * 班组下拉选
+     * @param dto
+     * @return AjaxResult
+     * @description
+     * @author cwchen
+     * @date 2024/3/18 13:26
+     */
+    AjaxResult getTeamLists(SelectDto dto);
 }

securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/SelectServiceImpl.java

@@ -117,4 +117,11 @@ public class SelectServiceImpl implements ISelectService {
         list = mapper.getTowerLists(dto);
         return AjaxResult.success(list);
     }
+
+    @Override
+    public AjaxResult getTeamLists(SelectDto dto) {
+        List<SelectVo> list = new ArrayList<>();
+        list = mapper.getTeamLists(dto);
+        return AjaxResult.success(list);
+    }
 }

securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/TeamQuEvalServiceImpl.java

@@ -49,7 +49,7 @@ public class TeamQuEvalServiceImpl implements ITeamQuEvalService {
                 String evalId = UUID.randomUUID().toString().replace("-", "");
                 vo.setEvalId(evalId);
                 vo.setType(1);
-                vo.setEvalTime(DateTimeHelper.getNowDate());
+                vo.setEvalTime(DateTimeHelper.getNowTime());
             } else {
                 vo.setType(2);
             }

securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/SelectMapper.xml

@@ -69,4 +69,15 @@
         </if>
 
     </select>
+    <!--班组下拉选-->
+    <select id="getTeamLists" resultType="com.securitycontrol.entity.system.vo.SelectVo">
+        SELECT team_id AS id,
+               team_name AS name,
+               team_leader AS teamLeader,
+               team_leader_phone AS teamLeaderPhone
+        FROM tb_work_team
+        <if test="param!=null and param!=''">
+            bid_code = #{param}
+        </if>
+    </select>
 </mapper>