事项申请列表增加类型名称

single-matter/src/main/java/com/mortals/xhx/module/apply/model/vo/MatterApplyVo.java

@@ -27,4 +27,6 @@ public class MatterApplyVo extends BaseEntityLong {
 
     /** 结束 申请时间 */
     private String applyTimeEnd;
+
+    private String applyTypeName;
 }
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/apply/service/impl/MatterApplyServiceImpl.java

@@ -5,6 +5,8 @@ import com.mortals.framework.model.Context;
 import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
 import com.mortals.framework.util.StringUtils;
+import com.mortals.xhx.base.system.user.model.UserEntity;
+import com.mortals.xhx.base.system.user.service.UserService;
 import com.mortals.xhx.module.apply.dao.MatterApplyDao;
 import com.mortals.xhx.module.apply.model.MatterApplyDatumEntity;
 import com.mortals.xhx.module.apply.model.MatterApplyDatumQuery;
@@ -38,6 +40,8 @@ public class MatterApplyServiceImpl extends AbstractCRUDServiceImpl<MatterApplyD
     private MatterApplyDatumService matterApplyDatumService;
     @Autowired
     private ApproverService approverService;
+    @Autowired
+    private UserService userService;
 
     @Override
     protected void saveBefore(MatterApplyEntity entity, Context context) throws AppException {
@@ -142,6 +146,20 @@ public class MatterApplyServiceImpl extends AbstractCRUDServiceImpl<MatterApplyD
             for (MatterApplyEntity entity:list){
                 List<MatterApplyDatumEntity> datumEntities = matterApplyDatumService.find(new MatterApplyDatumQuery().applyId(entity.getId()));
                 entity.setApplyDatumList(datumEntities);
+                if(entity.getApplyType()==1){
+                    entity.setApplyTypeName("移动端申请");
+                }else {
+                    if(entity.getCreateUserId()!=null) {
+                        UserEntity userEntity = userService.get(entity.getCreateUserId());
+                        if(userEntity!=null) {
+                            entity.setApplyTypeName("后台申请(" + userEntity.getRealName() + ")");
+                        }else {
+                            entity.setApplyTypeName("后台申请");
+                        }
+                    }else {
+                        entity.setApplyTypeName("后台申请");
+                    }
+                }
             }
         }
     }