Merge branch 'master' of http://gitlab.scsmile.cn/zxf/attendance-performance-platform

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/BaseReq.java

@@ -40,6 +40,9 @@ public abstract class BaseReq implements Serializable {
      * 规则编码
      */
     private String ruleCode;
+
+    private Long ruleId;
+
     private String phone;
 
 

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/InspectApiController.java

@@ -245,15 +245,14 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
 
     private boolean attend(InspectSaveReq req) throws AppException {
         //考勤保存
-        //通过手机号码查询员工属性
-        PerformRulesEntity rule = getRule(req.getRuleCode());
-        StaffEntity staffEntity = getStaff(req.getPhone());
+        PerformRulesEntity rule = getRule(req.getRuleId().toString());
+        //StaffEntity staffEntity = getStaff(req.getPhone());
 
         PerformAttendRecordEntity recordEntity = new PerformAttendRecordEntity();
         recordEntity.initAttrValue();
         BeanUtils.copyProperties(req, recordEntity);
-        recordEntity.setStaffId(staffEntity.getId());
-        recordEntity.setStaffName(staffEntity.getName());
+      //  recordEntity.setStaffId(staffEntity.getId());
+      //  recordEntity.setStaffName(staffEntity.getName());
 
 
         recordEntity.setSubAddType(rule.getSubAddType());
@@ -274,15 +273,15 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
 
     private boolean review(InspectSaveReq req) throws AppException {
         //评价保存
-        StaffEntity staffEntity = getStaff(req.getPhone());
-        PerformRulesEntity rule = getRule(req.getRuleCode());
+       // StaffEntity staffEntity = getStaff(req.getPhone());
+        PerformRulesEntity rule = getRule(req.getRuleId().toString());
 
         PerformReviewRecordEntity recordEntity = new PerformReviewRecordEntity();
 
         recordEntity.initAttrValue();
         BeanUtils.copyProperties(req, recordEntity);
-        recordEntity.setStaffId(staffEntity.getId());
-        recordEntity.setStaffName(staffEntity.getName());
+      //  recordEntity.setStaffId(staffEntity.getId());
+     //   recordEntity.setStaffName(staffEntity.getName());
         recordEntity.setSubAddType(rule.getSubAddType());
         recordEntity.setScore(rule.getScore());
         recordEntity.setRuleId(rule.getId());
@@ -299,15 +298,15 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
 
     private boolean complain(InspectSaveReq req) throws AppException {
         //投诉保存
-        StaffEntity staffEntity = getStaff(req.getPhone());
-        PerformRulesEntity rule = getRule(req.getRuleCode());
+       // StaffEntity staffEntity = getStaff(req.getPhone());
+        PerformRulesEntity rule = getRule(req.getRuleId().toString());
 
         PerformComplainRecordEntity recordEntity = new PerformComplainRecordEntity();
 
         recordEntity.initAttrValue();
         BeanUtils.copyProperties(req, recordEntity);
-        recordEntity.setStaffId(staffEntity.getId());
-        recordEntity.setStaffName(staffEntity.getName());
+       // recordEntity.setStaffId(staffEntity.getId());
+       // recordEntity.setStaffName(staffEntity.getName());
         recordEntity.setSubAddType(rule.getSubAddType());
         recordEntity.setScore(rule.getScore());
         recordEntity.setRuleId(rule.getId());
@@ -324,15 +323,15 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
 
     private boolean gowork(InspectSaveReq req) throws AppException {
         //办件保存
-        StaffEntity staffEntity = getStaff(req.getPhone());
-        PerformRulesEntity rule = getRule(req.getRuleCode());
+       // StaffEntity staffEntity = getStaff(req.getPhone());
+        PerformRulesEntity rule = getRule(req.getRuleId().toString());
 
         PerformGoworkRecordEntity recordEntity = new PerformGoworkRecordEntity();
 
         recordEntity.initAttrValue();
         BeanUtils.copyProperties(req, recordEntity);
-        recordEntity.setStaffId(staffEntity.getId());
-        recordEntity.setStaffName(staffEntity.getName());
+       // recordEntity.setStaffId(staffEntity.getId());
+       // recordEntity.setStaffName(staffEntity.getName());
         recordEntity.setSubAddType(rule.getSubAddType());
         recordEntity.setScore(rule.getScore());
         recordEntity.setRuleId(rule.getId());
@@ -349,15 +348,15 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
 
     private boolean effect(InspectSaveReq req) throws AppException {
         //效能保存
-        StaffEntity staffEntity = getStaff(req.getPhone());
-        PerformRulesEntity rule = getRule(req.getRuleCode());
+        //StaffEntity staffEntity = getStaff(req.getPhone());
+        PerformRulesEntity rule = getRule(req.getRuleId().toString());
 
         PerformEffectRecordEntity recordEntity = new PerformEffectRecordEntity();
 
         recordEntity.initAttrValue();
         BeanUtils.copyProperties(req, recordEntity);
-        recordEntity.setStaffId(staffEntity.getId());
-        recordEntity.setStaffName(staffEntity.getName());
+        //recordEntity.setStaffId(staffEntity.getId());
+        //recordEntity.setStaffName(staffEntity.getName());
         recordEntity.setSubAddType(rule.getSubAddType());
         recordEntity.setScore(rule.getScore());
         recordEntity.setRuleId(rule.getId());
@@ -374,15 +373,15 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
     private boolean other(InspectSaveReq req) throws AppException {
         //其它保存
 
-        StaffEntity staffEntity = getStaff(req.getPhone());
-        PerformRulesEntity rule = getRule(req.getRuleCode());
+       // StaffEntity staffEntity = getStaff(req.getPhone());
+        PerformRulesEntity rule = getRule(req.getRuleId().toString());
 
         PerformOtherRecordEntity recordEntity = new PerformOtherRecordEntity();
 
         recordEntity.initAttrValue();
         BeanUtils.copyProperties(req, recordEntity);
-        recordEntity.setStaffId(staffEntity.getId());
-        recordEntity.setStaffName(staffEntity.getName());
+        //recordEntity.setStaffId(staffEntity.getId());
+       // recordEntity.setStaffName(staffEntity.getName());
         recordEntity.setSubAddType(rule.getSubAddType());
         recordEntity.setScore(rule.getScore());
         recordEntity.setRuleId(rule.getId());
@@ -397,14 +396,16 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
     }
 
 
-    private PerformRulesEntity getRule(String ruleCode) {
-        PerformRulesEntity rule = rulesService.getCache(ruleCode);
+
+    private PerformRulesEntity getRule(String ruleId) {
+        PerformRulesEntity rule = rulesService.getCache(ruleId);
         if (ObjectUtils.isEmpty(rule))
-            throw new AppException(String.format("当前手机号码未找到匹配的员工！rule:%s", ruleCode));
+            throw new AppException(String.format("当前手机号码未找到匹配的员工！rule:%s", ruleId));
 
         return rule;
     }
 
+
     private StaffEntity getStaff(String phone) {
         StaffEntity staffEntity = staffService.selectOne(new StaffQuery().phoneNumber(phone));
         if (ObjectUtils.isEmpty(staffEntity))

attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/web/FeedbackController.java

@@ -6,10 +6,11 @@ import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.model.Result;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
-import com.mortals.xhx.module.feedback.model.FeedbackAnswerEntity;
+import com.mortals.xhx.module.feedback.model.*;
 import com.mortals.xhx.module.feedback.model.vo.FeedbackStaffInfoVo;
 import com.mortals.xhx.module.feedback.model.vo.OptionSummaryVo;
 import com.mortals.xhx.module.feedback.model.vo.QuestionAnswerVo;
+import com.mortals.xhx.module.feedback.service.FeedbackOptionService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
@@ -20,7 +21,6 @@ import com.mortals.framework.model.Context;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
-import com.mortals.xhx.module.feedback.model.FeedbackEntity;
 import com.mortals.xhx.module.feedback.service.FeedbackService;
 import org.apache.commons.lang3.ArrayUtils;
 import com.mortals.framework.util.StringUtils;
@@ -45,6 +45,9 @@ public class FeedbackController extends BaseCRUDJsonBodyMappingController<Feedba
     @Autowired
     private ParamService paramService;
 
+    @Autowired
+    private FeedbackOptionService feedbackOptionService;
+
     public FeedbackController(){
         super.setModuleDesc( "绩效反馈记录信息");
     }
@@ -60,6 +63,17 @@ public class FeedbackController extends BaseCRUDJsonBodyMappingController<Feedba
         super.init(model, context);
     }
 
+    @Override
+    protected int infoAfter(Long id, Map<String, Object> model, FeedbackEntity entity, Context context) throws AppException {
+        if(CollectionUtils.isNotEmpty(entity.getFeedbackQuestionList())){
+            for(FeedbackQuestionEntity item:entity.getFeedbackQuestionList()){
+                List<FeedbackOptionEntity> optionEntities = feedbackOptionService.find(new FeedbackOptionQuery().questionId(item.getId()));
+                item.setFeedbackOptionList(optionEntities);
+            }
+        }
+        return super.infoAfter(id, model, entity, context);
+    }
+
     /**
      * 查询问卷反馈人员列表
      * @param query
@@ -195,9 +209,4 @@ public class FeedbackController extends BaseCRUDJsonBodyMappingController<Feedba
         return ret;
     }
 
-
-    @Override
-    protected int infoAfter(Long id, Map<String, Object> model, FeedbackEntity entity, Context context) throws AppException {
-        return super.infoAfter(id, model, entity, context);
-    }
 }
\ No newline at end of file