Merge branch 'demo_' of http://123.60.19.203:8088/hitch/hitch-sb into demo_

platform-dao/src/main/java/com/platform/dao/mapper/repair/RepairApplicationFormMapper.java

@@ -18,6 +18,7 @@ import java.util.List;
  */
 @Component
 public interface RepairApplicationFormMapper extends MyMapper<RepairApplicationForm> {
+    String getDeptName(String id);
     /**
      * 分页查询
      * @param dto

platform-dao/src/main/java/com/platform/dao/vo/repair/RepairApplicationFormVO.java

@@ -27,6 +27,7 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class RepairApplicationFormVO extends BaseVO implements Serializable {
+    private String name;
     /**
      * 报修人员id
      */

platform-dao/src/main/resources/mapper/repair/RepairApplicationFormMapper.xml

@@ -310,4 +310,10 @@
         </set>
         where id = #{id}
     </update>
+
+    <select id="getDeptName" parameterType="String"
+            resultType="String">
+        select name from t_sys_dept
+        where dept_id=#{id}
+    </select>
 </mapper>

platform-rest/src/main/java/com/platform/rest/RestApplication.java

@@ -20,7 +20,6 @@ import java.util.TimeZone;
 @QmEnableResourceServer
 @EnableAsync
 public class RestApplication {
-
     public static void main(String[] args) {
         TimeZone.setDefault(TimeZone.getTimeZone("Asia/Shanghai"));
         SpringApplication.run(RestApplication.class, args);

platform-rest/src/main/java/com/platform/rest/controller/repair/RepairSchemeController.java

@@ -72,7 +72,7 @@ public class RepairSchemeController {
   }
 
 
-                                                                                
+
   /**
    * 通过id删除一条记录
    *

platform-service/src/main/java/com/platform/service/repair/impl/RepairApplicationFormServiceImpl.java

@@ -377,8 +377,10 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
     @Override
     public RepairApplicationFormVO getById(Object id) {
         RepairApplicationForm model = mapper.selectById(id);
+        String name=mapper.getDeptName(model.getRepairDeptId());
         RepairApplicationFormVO vo = new RepairApplicationFormVO();
         BeanUtil.copyProperties(model, vo);
+        vo.setName(name);
         Weekend<SysFile> weekend = new Weekend<>(SysFile.class);
         weekend.weekendCriteria().andEqualTo(SysFile::getTargetId, vo.getId());
         List<SysFile> sysFiles = sysFileService.getListByTargetAndType(vo.getId(), null);