新增巡查人员管理人员

BJYSYBZ_S/src/main/java/com/zjugis/ysgzybz/controller/rest/XcryController.java

@@ -58,6 +58,18 @@ public class XcryController extends BaseRestController {
         }
     }
 
+    @GetMapping("/listByAdmin")
+    public Object listByAdmin() {
+        try {
+            logger.info("/api/xcry/listByAdmin 接口调用~~~");
+            return result(xcryService.listByAdmin());
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            logger.warn("/api/xcry/listByAdmin 接口异常 -> " + ex.getMessage());
+            return error(ex.getMessage(), BaseRestController.ErrorCode.DEFAULT);
+        }
+    }
+
     @GetMapping("/delete")
     public Object delete(@RequestParam("id") String id) {
         try {

BJYSYBZ_S/src/main/java/com/zjugis/ysgzybz/dao/XcryMapper.java

@@ -25,4 +25,6 @@ public interface XcryMapper extends BaseMapper<Bjxcry> {
     List<BjXcryDkRespVO> getXcryDk(@Param("dkIds")List<String> dkIds, @Param("dkbh")String dkbh);
 
     List<Bjxcry> getXcryByDksyh(@Param("dksyh")String dksyh);
+
+    List<Map> listByAdmin();
 }

BJYSYBZ_S/src/main/java/com/zjugis/ysgzybz/service/XcryService.java

@@ -45,4 +45,6 @@ public interface XcryService extends IService<Bjxcry> {
      * @return
      */
     String getPhoneNumber(String code) throws Exception;
+
+    List<Map> listByAdmin();
 }

BJYSYBZ_S/src/main/java/com/zjugis/ysgzybz/service/impl/XcjlServiceImpl.java

@@ -46,8 +46,8 @@ public class XcjlServiceImpl extends ServiceImpl<XcjlMapper, Bjxcjl> implements
             BjxcjlImg detail = new BjxcjlImg();
             detail.setXcjlId(entiy.getId());
             detail.setFileId(detailReqVo.getFileId());
-            detail.setLng(detail.getLng());
-            detail.setLat(detail.getLat());
+            detail.setLng(detailReqVo.getLng());
+            detail.setLat(detailReqVo.getLat());
             xcjlImgService.save(detail);
         }
         return entiy;
@@ -69,7 +69,7 @@ public class XcjlServiceImpl extends ServiceImpl<XcjlMapper, Bjxcjl> implements
             respVO.setXzms(bjxcjl.getXzms());
             respVO.setXcsj(bjxcjl.getXcsj());
             QueryWrapper<BjxcjlImg> detailQueryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("xcjl_id", dksyh);
+            detailQueryWrapper.eq("xcjl_id", bjxcjl.getId());
             List<BjxcjlImg> imgList = xcjlImgService.list(detailQueryWrapper);
             List<BjxcjlImgRespVO> imgRespVOS = new ArrayList<>();
             for (BjxcjlImg bjxcjlImg : imgList) {

BJYSYBZ_S/src/main/java/com/zjugis/ysgzybz/service/impl/XcryServiceImpl.java

@@ -18,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -64,9 +65,13 @@ public class XcryServiceImpl extends ServiceImpl<XcryMapper, Bjxcry> implements
 
     @Override
     public List<BjXcryDkRespVO> getXcryDkList(String xcryId, String dkbh) {
-        List<String> dkIds = xcryMapper.getDkIds(xcryId);
-        if(CollectionUtil.isEmpty(dkIds)){
-            return null;
+        Bjxcry bjxcry = xcryMapper.selectById(xcryId);
+        List<String> dkIds = new ArrayList<>();
+        if(StringUtils.isNotBlank(bjxcry.getGddw())){
+            dkIds = xcryMapper.getDkIds(xcryId);
+            if(CollectionUtil.isEmpty(dkIds)){
+                return null;
+            }
         }
         return xcryMapper.getXcryDk(dkIds,dkbh);
     }
@@ -100,6 +105,11 @@ public class XcryServiceImpl extends ServiceImpl<XcryMapper, Bjxcry> implements
         return phoneNumber;
     }
 
+    @Override
+    public List<Map> listByAdmin() {
+        return xcryMapper.listByAdmin();
+    }
+
     private String getWxAccessToken() throws Exception {
         String ACCESS_TOKEN_API = "https://api.weixin.qq.com/cgi-bin/token";
         String wx_appid = "wxf515059e19e3d655";

BJYSYBZ_S/src/main/resources/mapper/XcryMapper.xml

@@ -40,7 +40,7 @@
                 </foreach>
             </if>
             <if test="dkbh != null and dkbh !=''">
-                and T1.dkbh like concat('%', concat(#{dto.name}, '%'))
+                and T1.dkbh like concat('%', concat(#{dkbh}, '%'))
             </if>
         </where>
     </select>
@@ -52,5 +52,12 @@
         WHERE
                 T1.ID IN ( SELECT XCRY_ID FROM sde.bjxcry_wkfly WHERE DKSYH = #{dksyh} )
     </select>
+    <select id="listByAdmin" resultType="java.util.Map">
+        SELECT
+            T1.*
+        FROM
+            sde.bjxcry T1
+        WHERE T1.GDDW IS NULL
+    </select>
 
 </mapper>