小程序-报修问题处理

zhsw-common/src/main/java/com/rongwei/zhsw/system/wechat/impl/RegistrationServiceImpl.java

@@ -19,6 +19,8 @@ import com.rongwei.zhsw.system.dao.CommonBusinessDao;
 import com.rongwei.zhsw.system.service.impl.SwFeedBackOpinionServiceImpl;
 import com.rongwei.zhsw.system.service.impl.SwUserRepairServiceImpl;
 import com.rongwei.zhsw.system.wechat.RegistrationService;
+import com.rongwe.zhsw.system.domain.SwUserManagementDo;
+import com.rongwei.zhsw.system.service.SwUserManagementService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -52,6 +54,8 @@ public class RegistrationServiceImpl implements RegistrationService {
     private CommonBusinessDao commonBusinessDao;
     @Autowired
     private SysConfigService sysConfigService;
+    @Autowired
+    private SwUserManagementService swUserManagementService;
 
     /**
      * 用户保修
@@ -73,12 +77,25 @@ public class RegistrationServiceImpl implements RegistrationService {
         swUserRepairDo.setRepairtype(weChatRepairReportVo.getRepairType());
         swUserRepairDo.setAccountname(weChatRepairReportVo.getUserName());
         swUserRepairDo.setDeclaccnum(weChatRepairReportVo.getUserNum());
+        
 //        ZHSWCommonUtils.replaceSysDictMethod(swUserRepairDo, SwUserRepairDo::getRepairtype, SwUserRepairDo::setRepairtype,
 //                "repair_management_report_type");
         swUserRepairDo.setRepairsource("2");
         swUserRepairDo.setIscompleted("2");
         swUserRepairDo.setFaultdescription(weChatRepairReportVo.getDescription());
         swUserRepairDo.setContactnumber(weChatRepairReportVo.getPhone());
+        
+        // 根据用户编号查询用户信息，获取villagename
+        SwUserManagementDo userManagementDo = swUserManagementService.getOne(
+            new com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper<SwUserManagementDo>()
+                .eq(SwUserManagementDo::getUsernumber, weChatRepairReportVo.getUserNum())
+                .eq(SwUserManagementDo::getDeleted, "0")
+                .last("LIMIT 1")
+        );
+        if (userManagementDo != null && userManagementDo.getVillagename() != null) {
+            swUserRepairDo.setVillagename(userManagementDo.getVillagename());
+        }
+        
         getHandlerInfoByVolumeNo("wxry", weChatRepairReportVo.getUserNum(), swUserRepairDo,
                 SwUserRepairDo::setRepairpersonid, SwUserRepairDo::setRepairperson);
 

zhsw-entity/src/main/java/com/rongwe/zhsw/system/domain/SwUserRepairDo.java

@@ -112,4 +112,12 @@ public class SwUserRepairDo extends BaseDo implements Serializable {
      * 回复内容
      */
     private String replycontent;
-}
+    /**
+     * 册号
+     */
+    private String volumeno;
+    /**
+     * 小区/村落/街道名称
+     */
+    private String villagename;
+}