修复提交

ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletExaminationController.java

@@ -43,6 +43,12 @@ public class ApiAppletExaminationController {
     @GetMapping("/questionList")
     public AjaxResult questionList(AppletQuestion question){
         List<AppletQuestion> questionList = appletQuestionService.selectAppletQuestionList(question);
+        for (AppletQuestion appletQuestion:questionList){
+            AppletAnswer appletAnswer = new AppletAnswer();
+            appletAnswer.setQuestionId(appletQuestion.getId());
+            List<AppletAnswer> answerList = appletAnswerService.selectAppletAnswerList(appletAnswer);
+            appletQuestion.setAnswerList(answerList);
+        }
         return AjaxResult.success("题目列表数据",questionList);
     }
 
@@ -94,7 +100,10 @@ public class ApiAppletExaminationController {
 
     @ApiOperation("伴宠师工作台-添加用户基本考核答案")
     @PostMapping("/addBaseAnswer")
-    public AjaxResult addBaseAnswer(AppletAnswerBase answerBase){
+    public AjaxResult addBaseAnswer(@RequestBody AppletAnswerBase answerBase){
+        if(answerBase.getUserId() == null){
+            return AjaxResult.error("userId用户信息标识不能为空");
+        }
         return toAjax(appletAnswerBaseService.insertAppletAnswerBase(answerBase));
     }
 
@@ -124,7 +133,10 @@ public class ApiAppletExaminationController {
 
     @ApiOperation("伴宠师工作台-添加用户培训考核答案")
     @PostMapping("/addTrainAnswer")
-    public AjaxResult addTrainAnswer(AppletAnswerTrain answerTrain){
+    public AjaxResult addTrainAnswer(@RequestBody AppletAnswerTrain answerTrain){
+        if(answerTrain.getUserId() == null){
+            return AjaxResult.error("userId用户信息标识不能为空");
+        }
         return toAjax(appletAnswerTrainService.insertAppletAnswerTrain(answerTrain));
     }
 

ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletHhrWorkInController.java

@@ -44,28 +44,28 @@ public class ApiAppletHhrWorkInController extends BaseController {
         List<AppBanner> bannerList = iAppBannerService.getBannerList();
         return AjaxResult.success("轮播图列表",bannerList);
     }
-
-    @ApiOperation("未加入的工作台图标配置查询")
-    @GetMapping("/indexConfigIco")
-    public AjaxResult getIndexConfigIcon(){
-//        List<IndexconfigIcon> indexconfigIconByIdentity = indexconfigIconService.getIndexconfigIconByIdentity();
-        List<AppletIcon> list = new ArrayList<>();
-        AppletIcon icon1 = new AppletIcon();
-        icon1.setType(0);
-        icon1.setImage("https://image.hhlm1688.com/img/work/log/indexInfo/1.png");
-        icon1.setName("用户绑定");
-        icon1.setUrl("/otherPages/workbenchManage/bindUser/index");
-        AppletIcon icon2 = new AppletIcon();
-        icon2.setType(0);
-        icon2.setImage("https://image.hhlm1688.com/img/work/log/indexInfo/2.png");
-        icon2.setName("我的用户");
-        icon2.setUrl("/otherPages/workbenchManage/myUser/");
-
-
-
-
-        return AjaxResult.success(list);
-    }
+//
+//    @ApiOperation("未加入的工作台图标配置查询")
+//    @GetMapping("/indexConfigIco")
+//    public AjaxResult getIndexConfigIcon(){
+////        List<IndexconfigIcon> indexconfigIconByIdentity = indexconfigIconService.getIndexconfigIconByIdentity();
+//        List<AppletIcon> list = new ArrayList<>();
+//        AppletIcon icon1 = new AppletIcon();
+//        icon1.setType(0);
+//        icon1.setImage("https://image.hhlm1688.com/img/work/log/indexInfo/1.png");
+//        icon1.setName("用户绑定");
+//        icon1.setUrl("/otherPages/workbenchManage/bindUser/index");
+//        AppletIcon icon2 = new AppletIcon();
+//        icon2.setType(0);
+//        icon2.setImage("https://image.hhlm1688.com/img/work/log/indexInfo/2.png");
+//        icon2.setName("我的用户");
+//        icon2.setUrl("/otherPages/workbenchManage/myUser/");
+//
+//
+//
+//
+//        return AjaxResult.success(list);
+//    }
 
     @ApiOperation("已加入的工作台图标配置查询")
     @GetMapping("/indexConfig")
@@ -151,7 +151,7 @@ public class ApiAppletHhrWorkInController extends BaseController {
 //    }
 
 
-    @ApiOperation("申请加入合伙人-需要token")
+    @ApiOperation("申请加入合伙人")
     @PostMapping("/joinHh")
     public AjaxResult joinHh(@RequestBody ApiQueryIIdDTO dto){
 //        AppUsers localAppletUser = AppletUtil.getLocalAppletUser();
@@ -161,17 +161,16 @@ public class ApiAppletHhrWorkInController extends BaseController {
         appUsersService.updateAppUsers(localAppletUser);
         return AjaxResult.success("申请成功合伙人");
     }
-
-    @ApiOperation("申请加入伴宠师-需要token")
-    @PostMapping("/joiBcs")
-    public AjaxResult joiBcs(@RequestBody ApiQueryIIdDTO dto){
-//        AppUsers localAppletUser = AppletUtil.getLocalAppletUser();
-        AppUsers localAppletUser = new AppUsers();
-        localAppletUser.setUserId(dto.getAppUserId());
-        localAppletUser.setUserBcs(1);
-        appUsersService.updateAppUsers(localAppletUser);
-        return AjaxResult.success("申请成功伴宠师");
-    }
+//
+//    @ApiOperation("申请加入伴宠师-需要token")
+//    @PostMapping("/joiBcs")
+//    public AjaxResult joiBcs(@RequestBody ApiQueryIIdDTO dto){
+//        AppUsers localAppletUser = new AppUsers();
+//        localAppletUser.setUserId(dto.getAppUserId());
+//        localAppletUser.setUserBcs(1);
+//        appUsersService.updateAppUsers(localAppletUser);
+//        return AjaxResult.success("申请成功伴宠师");
+//    }
 
 
 }

ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletUserTeacherController.java

@@ -1,6 +1,7 @@
 package com.ruoyi.applet.contoller;
 
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.model.domain.AppUsers;
 import com.ruoyi.model.domain.AppletUsersTeacher;
 import com.ruoyi.model.service.IAppUsersService;
@@ -42,13 +43,23 @@ public class ApiAppletUserTeacherController {
     @ApiOperation("伴宠师工作台-伴宠师基本信息添加")
     @PostMapping("/insertUser")
     public AjaxResult insertUser(@RequestBody AppletUsersTeacher usersTeacher){
+        if(usersTeacher.getUserId() == null){
+           return AjaxResult.error("userId用户信息标识不能为空");
+        }
         usersTeacher.setStatus(0L);
+        AppletUsersTeacher appletUsersTeacher = appletUsersTeacherService.selectAppletUsersTeacherByUserId(usersTeacher.getUserId());
+        if(appletUsersTeacher != null){
+            return AjaxResult.error("您已经提交过了请不要重复提交");
+        }
         return toAjax(appletUsersTeacherService.insertAppletUsersTeacher(usersTeacher));
     }
 
     @ApiOperation("伴宠师工作台-伴宠师基本信息修改")
     @PostMapping("/udpateUser")
     public AjaxResult udpateUser(@RequestBody AppletUsersTeacher usersTeacher){
+        if(usersTeacher.getId() == null){
+            return AjaxResult.error("标识不能为空");
+        }
         return toAjax(appletUsersTeacherService.updateAppletUsersTeacher(usersTeacher));
     }
 

ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletQuestion.java

@@ -1,16 +1,21 @@
 package com.ruoyi.model.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
+import java.util.List;
+
 /**
  * 考核题库对象 applet_question
  * 
  * @author ruoyi
  * @date 2025-03-28
  */
+@Data
 public class AppletQuestion extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -33,64 +38,68 @@ public class AppletQuestion extends BaseEntity
     /** 删除标识 */
     private Integer delFlag;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setTitle(String title) 
-    {
-        this.title = title;
-    }
-
-    public String getTitle() 
-    {
-        return title;
-    }
-    public void setType(String type) 
-    {
-        this.type = type;
-    }
-
-    public String getType() 
-    {
-        return type;
-    }
-    public void setOrderNo(Long orderNo) 
-    {
-        this.orderNo = orderNo;
-    }
-
-    public Long getOrderNo() 
-    {
-        return orderNo;
-    }
-    public void setDelFlag(Integer delFlag) 
-    {
-        this.delFlag = delFlag;
-    }
 
-    public Integer getDelFlag() 
-    {
-        return delFlag;
-    }
+    @TableField(exist = false)
+    private List<AppletAnswer> answerList;
 
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("title", getTitle())
-            .append("type", getType())
-            .append("orderNo", getOrderNo())
-            .append("delFlag", getDelFlag())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .toString();
-    }
+//    public void setId(Long id)
+//    {
+//        this.id = id;
+//    }
+//
+//    public Long getId()
+//    {
+//        return id;
+//    }
+//    public void setTitle(String title)
+//    {
+//        this.title = title;
+//    }
+//
+//    public String getTitle()
+//    {
+//        return title;
+//    }
+//    public void setType(String type)
+//    {
+//        this.type = type;
+//    }
+//
+//    public String getType()
+//    {
+//        return type;
+//    }
+//    public void setOrderNo(Long orderNo)
+//    {
+//        this.orderNo = orderNo;
+//    }
+//
+//    public Long getOrderNo()
+//    {
+//        return orderNo;
+//    }
+//    public void setDelFlag(Integer delFlag)
+//    {
+//        this.delFlag = delFlag;
+//    }
+//
+//    public Integer getDelFlag()
+//    {
+//        return delFlag;
+//    }
+//
+//    @Override
+//    public String toString() {
+//        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+//            .append("id", getId())
+//            .append("title", getTitle())
+//            .append("type", getType())
+//            .append("orderNo", getOrderNo())
+//            .append("delFlag", getDelFlag())
+//            .append("createBy", getCreateBy())
+//            .append("createTime", getCreateTime())
+//            .append("updateBy", getUpdateBy())
+//            .append("updateTime", getUpdateTime())
+//            .toString();
+//    }
 }

ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletUsersTeacher.java

@@ -11,7 +11,6 @@ import java.time.LocalDateTime;
 @Data
 public class AppletUsersTeacher {
     private static final long serialVersionUID = 1L;
-
     /** 标识 */
     private Long id;
 
@@ -69,20 +68,26 @@ public class AppletUsersTeacher {
     @Excel(name = "详细地址")
     private String address;
 
-    /** 创建人 */
-    @Excel(name = "创建人")
-    private String createBy;
-
     /** 经度 */
     @Excel(name = "经度")
     private String longitude;
 
-    /** 修改人 */
-    @Excel(name = "修改人")
-    private String updateBy;
-
     /** 纬度 */
     @Excel(name = "纬度")
     private String latitude;
 
+    /** 创建人 */
+    private String createBy;
+
+    /** 修改人 */
+    private String updateBy;
+
+    /** 年龄 */
+    @Excel(name = "年龄")
+    private Long age;
+
+    /** 专业执照选项 */
+    @Excel(name = "专业执照选项")
+    private String license;
+
 }

ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AApiAppletLoginServiceImpl.java

@@ -24,6 +24,7 @@ import javax.annotation.Resource;
 import java.io.BufferedReader;
 import java.io.DataOutputStream;
 import java.io.InputStreamReader;
+import java.math.BigDecimal;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
@@ -81,6 +82,8 @@ public class AApiAppletLoginServiceImpl implements IAApiAppletLoginService {
             appUsers.setUserName("伴宠师"+System.currentTimeMillis());//lzx需要修改到conf中的配置获取
             appUsers.setUserImage("https://image.hhlm1688.com/img/work/log/headImage.png"); //lzx需要修改到conf中的配置获取
             appUsers.setCreateTime(LocalDateTime.now());
+            appUsers.setPrice(new BigDecimal(0));
+
             appUsersService.insertAppUsers(appUsers);
 
             LoginApplet loginApplet = new LoginApplet();

ruoyi-catdog/src/main/resources/mapper/model/AppletUsersTeacherMapper.xml

@@ -20,14 +20,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="area" column="area"/>
         <result property="updateTime" column="update_time"/>
         <result property="address" column="address"/>
-        <result property="createBy" column="create_by"/>
         <result property="longitude" column="longitude"/>
-        <result property="updateBy" column="update_by"/>
         <result property="latitude" column="latitude"/>
+        <result property="createBy" column="create_by"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="age" column="age"/>
+        <result property="license" column="license"/>
     </resultMap>
 
     <sql id="selectAppletUsersTeacherVo">
-        select id, user_id, name, id_card, sex, phone, experience, is_have, pet_type, status, images, area, create_time, address, update_time, longitude, create_by, update_by, latitude  from applet_users_teacher
+        select id, user_id, name, id_card, sex, phone, experience, is_have, pet_type, status, images, create_time, area, update_time, address, longitude, latitude, create_by, update_by, age, license  from applet_users_teacher
     </sql>
 
     <select id="selectAppletUsersTeacherList" parameterType="AppletUsersTeacher" resultMap="AppletUsersTeacherResult">
@@ -46,9 +48,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="area != null  and area != ''"> and area = #{area}</if>
             <if test="address != null  and address != ''"> and address = #{address}</if>
             <if test="longitude != null  and longitude != ''"> and longitude = #{longitude}</if>
-            <if test="createBy != null  and createBy != ''"> and create_by = #{createBy}</if>
-            <if test="updateBy != null  and updateBy != ''"> and update_by = #{updateBy}</if>
             <if test="latitude != null  and latitude != ''"> and latitude = #{latitude}</if>
+            <if test="age != null "> and age = #{age}</if>
+            <if test="license != null  and license != ''"> and license = #{license}</if>
         </where>
     </select>
     
@@ -76,14 +78,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="petType != null">pet_type,</if>
             <if test="status != null">status,</if>
             <if test="images != null">images,</if>
-            <if test="area != null">area,</if>
             <if test="createTime != null">create_time,</if>
-            <if test="address != null">address,</if>
+            <if test="area != null">area,</if>
             <if test="updateTime != null">update_time,</if>
+            <if test="address != null">address,</if>
             <if test="longitude != null">longitude,</if>
+            <if test="latitude != null">latitude,</if>
             <if test="createBy != null">create_by,</if>
             <if test="updateBy != null">update_by,</if>
-            <if test="latitude != null">latitude,</if>
+            <if test="age != null">age,</if>
+            <if test="license != null">license,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -97,14 +101,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="petType != null">#{petType},</if>
             <if test="status != null">#{status},</if>
             <if test="images != null">#{images},</if>
-            <if test="area != null">#{area},</if>
             <if test="createTime != null">#{createTime},</if>
-            <if test="address != null">#{address},</if>
+            <if test="area != null">#{area},</if>
             <if test="updateTime != null">#{updateTime},</if>
+            <if test="address != null">#{address},</if>
             <if test="longitude != null">#{longitude},</if>
+            <if test="latitude != null">#{latitude},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="updateBy != null">#{updateBy},</if>
-            <if test="latitude != null">#{latitude},</if>
+            <if test="age != null">#{age},</if>
+            <if test="license != null">#{license},</if>
         </trim>
     </insert>
 
@@ -121,14 +127,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="petType != null">pet_type = #{petType},</if>
             <if test="status != null">status = #{status},</if>
             <if test="images != null">images = #{images},</if>
-            <if test="area != null">area = #{area},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="address != null">address = #{address},</if>
+            <if test="area != null">area = #{area},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="address != null">address = #{address},</if>
             <if test="longitude != null">longitude = #{longitude},</if>
+            <if test="latitude != null">latitude = #{latitude},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="latitude != null">latitude = #{latitude},</if>
+            <if test="age != null">age = #{age},</if>
+            <if test="license != null">license = #{license},</if>
         </trim>
         where id = #{id}
     </update>