nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/orgapplyinfo/api/IOrgApplyInfoApi.java

@@ -10,5 +10,5 @@ public interface IOrgApplyInfoApi {
 
     int updateById(OrgApplyInfoApiEntity orgApplyInfoApiEntity);
 
-    List<OrgApplyInfoApiEntity> queryAuditInfo(String openId, String id, String status);
+    List<OrgApplyInfoApiEntity> queryAuditInfo(String tel);
 }

nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/NuBizAdvisoryInfo/controller/H5ApiAdvisoryInfoController.java

@@ -17,7 +17,6 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryRuleEnum;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.web.bind.annotation.*;
@@ -56,7 +55,6 @@ public class H5ApiAdvisoryInfoController extends JeecgController<NuBizAdvisoryIn
    @PostMapping(value = "/add")
    public Result<Object> add(@RequestBody NuBizAdvisoryInfo nuBizAdvisoryInfo) {
        nuBizAdvisoryInfoService.save(nuBizAdvisoryInfo);
-       nuBizAdvisoryInfoService.handlePlatId(nuBizAdvisoryInfo);
        return Result.OK(nuBizAdvisoryInfo);
    }
 
@@ -128,12 +126,22 @@ public class H5ApiAdvisoryInfoController extends JeecgController<NuBizAdvisoryIn
     @ApiOperation(value="修改咨询信息", notes="修改咨询信息")
     @RequestMapping(value = "/editNuBizAdvisoryInfo", method = {RequestMethod.PUT,RequestMethod.POST})
     public Result<String> editNuBizAdvisoryInfo(@RequestBody NuBizAdvisoryInfo nuBizAdvisoryInfo) {
+        if(StringUtils.isEmpty(nuBizAdvisoryInfo.getOpenId())){
+            return Result.error("填写openId");
+        }
+        if(StringUtils.isEmpty(nuBizAdvisoryInfo.getServerUrl())){
+            return Result.error("填写微信名称");
+        }
         QueryWrapper<NuBizAdvisoryInfo> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("open_id",nuBizAdvisoryInfo.getOpenId());
-        NuBizAdvisoryInfo upData = new NuBizAdvisoryInfo();
+        NuBizAdvisoryInfo nuBizAdvisoryInfoQuery = nuBizAdvisoryInfoService.getOne(queryWrapper);
-        upData.setAvatar(nuBizAdvisoryInfo.getAvatar());//改头像
+        if(nuBizAdvisoryInfoQuery == null){
-        upData.setNickName(nuBizAdvisoryInfo.getNickName());//改昵称
+            return Result.error("未找到对应数据");
-        nuBizAdvisoryInfoService.update(upData,queryWrapper);
+        }
+        UpdateWrapper<NuBizAdvisoryInfo> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("open_id",nuBizAdvisoryInfo.getOpenId());
+        updateWrapper.set("server_url",nuBizAdvisoryInfo.getServerUrl());
+        nuBizAdvisoryInfoService.update(updateWrapper);
         return Result.OK("编辑成功!");
     }
 

nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/NuBizAdvisoryInfo/entity/NuBizAdvisoryInfo.java

@@ -38,9 +38,6 @@ public class NuBizAdvisoryInfo implements Serializable {
 	@TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "id")
     private String id;
-    /**平台id*/
-    @ApiModelProperty(value = "平台Id")
-    private Long platId;
     /**微信id*/
     @Excel(name = "微信id", width = 15)
     @ApiModelProperty(value = "微信id")
@@ -53,13 +50,6 @@ public class NuBizAdvisoryInfo implements Serializable {
 	@Excel(name = "咨询人姓名", width = 15)
     @ApiModelProperty(value = "咨询人姓名")
     private String name;
-    /**昵称*/
-    @Excel(name = "昵称", width = 15)
-    @ApiModelProperty(value = "昵称")
-    private String nickName;
-    /**头像*/
-    @ApiModelProperty(value = "头像")
-    private String avatar;
 	/**性别*/
 	@Excel(name = "性别", width = 15, dicCode = "sex")
 	@Dict(dicCode = "sex")
@@ -130,6 +120,7 @@ public class NuBizAdvisoryInfo implements Serializable {
     private String izJs;//是否是家属 0否 1是
     private String izJg;//是否是机构 0否 1是
 
+
     @TableField(exist = false)
     private String advisoryTypeName;
     @TableField(exist = false)

nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/NuBizAdvisoryInfo/mapper/NuBizAdvisoryInfoMapper.java

@@ -17,5 +17,4 @@ public interface NuBizAdvisoryInfoMapper extends BaseMapper<NuBizAdvisoryInfo> {
     NuBizAdvisoryInfo getUserByTel(@Param("mobile") String mobile);
 
     NuBizAdvisoryInfo findByOpenId(@Param("openId")String openId);
-
 }

nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/NuBizAdvisoryInfo/mapper/xml/NuBizAdvisoryInfoMapper.xml

@@ -8,5 +8,4 @@
     <select id="findByOpenId" resultType="com.nu.modules.NuBizAdvisoryInfo.entity.NuBizAdvisoryInfo">
         select * from nu_biz_advisory_info where open_id=#{openId}
     </select>
-
 </mapper>

nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/NuBizAdvisoryInfo/service/INuBizAdvisoryInfoService.java

@@ -16,6 +16,4 @@ public interface INuBizAdvisoryInfoService extends IService<NuBizAdvisoryInfo> {
     NuBizAdvisoryInfo getUserByTel(String mobile);
 
     NuBizAdvisoryInfo findByOpenId(String openId);
-
-    void handlePlatId(NuBizAdvisoryInfo nuBizAdvisoryInfo);
 }

nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/NuBizAdvisoryInfo/service/impl/NuBizAdvisoryInfoServiceImpl.java

@@ -17,8 +17,6 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 import javax.servlet.http.HttpServletRequest;
-import java.time.LocalDate;
-import java.time.format.DateTimeFormatter;
 import java.util.LinkedHashMap;
 import java.util.List;
 
@@ -46,22 +44,6 @@ public class NuBizAdvisoryInfoServiceImpl extends ServiceImpl<NuBizAdvisoryInfoM
             nuBizAdvisoryInfo.setOpenId(openId);
             nuBizAdvisoryInfo.setWechatName(wechatName);
             baseMapper.insert(nuBizAdvisoryInfo);
-
-            QueryWrapper<NuBizAdvisoryInfo> qw = new QueryWrapper<>();
-            qw.orderByDesc("plat_id");
-            qw.last("limit 1");
-            NuBizAdvisoryInfo info = baseMapper.selectOne(qw);
-            if (info.getPlatId() == null) {
-                System.out.println(LocalDate.now().format(DateTimeFormatter.ofPattern("yyMM")) + "000001");
-                System.out.println(Long.parseLong(LocalDate.now().format(DateTimeFormatter.ofPattern("yyMM")) + "000001"));
-                nuBizAdvisoryInfo.setPlatId(Long.parseLong(LocalDate.now().format(DateTimeFormatter.ofPattern("yyMM")) + "000001"));
-                System.out.println(nuBizAdvisoryInfo.getPlatId());
-            } else {
-                String maxPlatId = info.getPlatId() + "";
-                long num = Long.parseLong(maxPlatId.substring(4));
-                nuBizAdvisoryInfo.setPlatId(Long.parseLong(LocalDate.now().format(DateTimeFormatter.ofPattern("yyMM")) + String.format("%06d", num + 1)));
-            }
-            baseMapper.updateById(nuBizAdvisoryInfo);
         }
 
         if(StringUtils.isNotBlank(nuBizAdvisoryInfo.getTel())){
@@ -70,7 +52,6 @@ public class NuBizAdvisoryInfoServiceImpl extends ServiceImpl<NuBizAdvisoryInfoM
         }
         return nuBizAdvisoryInfo;
     }
-
     /**
      * 用户信息
      *
@@ -97,23 +78,4 @@ public class NuBizAdvisoryInfoServiceImpl extends ServiceImpl<NuBizAdvisoryInfoM
     public NuBizAdvisoryInfo findByOpenId(String openId) {
         return  baseMapper.findByOpenId(openId);
     }
-
-    @Override
-    public void handlePlatId(NuBizAdvisoryInfo nuBizAdvisoryInfo) {
-        QueryWrapper<NuBizAdvisoryInfo> qw = new QueryWrapper<>();
-        qw.orderByDesc("plat_id");
-        qw.last("limit 1");
-        NuBizAdvisoryInfo info = baseMapper.selectOne(qw);
-        if (info.getPlatId() == null) {
-            System.out.println(LocalDate.now().format(DateTimeFormatter.ofPattern("yyMM")) + "000001");
-            System.out.println(Long.parseLong(LocalDate.now().format(DateTimeFormatter.ofPattern("yyMM")) + "000001"));
-            nuBizAdvisoryInfo.setPlatId(Long.parseLong(LocalDate.now().format(DateTimeFormatter.ofPattern("yyMM")) + "000001"));
-            System.out.println(nuBizAdvisoryInfo.getPlatId());
-        } else {
-            String maxPlatId = info.getPlatId() + "";
-            long num = Long.parseLong(maxPlatId.substring(4));
-            nuBizAdvisoryInfo.setPlatId(Long.parseLong(LocalDate.now().format(DateTimeFormatter.ofPattern("yyMM")) + String.format("%06d", num + 1)));
-        }
-        baseMapper.updateById(nuBizAdvisoryInfo);
-    }
 }

nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/service/impl/OrgApplyInfoServiceImpl.java

@@ -9,7 +9,6 @@ import com.nu.modules.orgapplyinfo.entity.OrgApplyInfoApiEntity;
 import com.nu.modules.orgapplyinfo.mapper.OrgApplyInfoMapper;
 import com.nu.modules.orgapplyinfo.service.IOrgApplyInfoService;
 import com.nu.utils.DictUtils;
-import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -45,15 +44,9 @@ public class OrgApplyInfoServiceImpl extends ServiceImpl<OrgApplyInfoMapper, Org
     }
 
     @Override
-    public List<OrgApplyInfoApiEntity> queryAuditInfo(String openId,String id, String status) {
+    public List<OrgApplyInfoApiEntity> queryAuditInfo(String tel) {
         QueryWrapper<OrgApplyInfo> qw = new QueryWrapper<>();
-        qw.eq("open_id", openId);
+        qw.eq("tel", tel);
-        if (StringUtils.isNotBlank(id)) {
-            qw.eq("id", id);
-        }
-        if (StringUtils.isNotBlank(status)) {
-            qw.eq("status", status);
-        }
         qw.orderByDesc("create_time");
         List<OrgApplyInfo> list = baseMapper.selectList(qw);
 

nursing-unit-api/src/main/java/com/nu/modules/wechat/orgapplyinfo/api/OrgApplyInfoApi.java

@@ -24,7 +24,6 @@ public class OrgApplyInfoApi {
 
     /**
      * 新增/编辑机构加盟申请信息
-     *
      * @param orgApplyInfoApiEntity
      * @return
      */
@@ -51,18 +50,16 @@ public class OrgApplyInfoApi {
     }
 
     /**
-     * 根据微信号获取加盟申请信息
+     * 根据手机号获取加盟申请信息
      *
-     * @param id     nu_org_apply_info表id
+     * @param tel
-     * @param openId 微信openid
-     * @param status 审核状态
      * @return
      */
     @GetMapping("/queryAuditInfo")
-    public Result<List<OrgApplyInfoApiEntity>> queryAuditInfo(@RequestParam("openId") String openId, @RequestParam(value = "id", required = false) String id, @RequestParam(value = "status", required = false) String status) {
+    public Result<List<OrgApplyInfoApiEntity>> queryAuditInfo(@RequestParam("tel") String tel){
-        if (StringUtils.isBlank(openId)) {
+        if(StringUtils.isBlank(tel)){
-            return Result.error("未填写openId");
+            return Result.error("手机号码错误");
         }
-        return Result.ok(orgApplyInfoApi.queryAuditInfo(openId, id,status));
+        return Result.ok(orgApplyInfoApi.queryAuditInfo(tel));
     }
 }