Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/controller/AIQuestionController.java

@@ -48,4 +48,11 @@ public class AIQuestionController {
         return msg;
     }
 
+    @PostMapping("/getCusReportForm")
+    public HttpRespMsg getCusReportForm(HttpServletRequest request){
+        HttpRespMsg msg = new HttpRespMsg();
+        msg = aiQuestionService.getCusReportForm(request);
+        return msg;
+    }
+
 }

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/mapper/BusReportStoreMapper.java

@@ -6,6 +6,10 @@ import com.management.platform.entity.BusReportStore;
 import com.management.platform.entity.bo.FormStorePageBO;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 public interface BusReportStoreMapper extends BaseMapper<BusReportStore> {
     IPage<BusReportStore> getPrivilegedFormStore(IPage<BusReportStore> page, @Param("queryBO") FormStorePageBO queryBO);
+
+    List<BusReportStore> getCusReportForm(@Param("queryBO") FormStorePageBO queryBO);
 }

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/AIQuestionService.java

@@ -16,4 +16,6 @@ public interface AIQuestionService extends IService<AIQuestion> {
     HttpRespMsg getLatestQuestionList(HttpServletRequest request);
 
     HttpRespMsg getHisQuestion(HttpServletRequest request);
+
+    HttpRespMsg getCusReportForm(HttpServletRequest request);
 }

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/impl/AIQuestionServiceImpl.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.management.platform.entity.*;
+import com.management.platform.entity.bo.FormStorePageBO;
 import com.management.platform.entity.bo.QuestionBO;
 import com.management.platform.mapper.*;
 import com.management.platform.service.AIQuestionService;
@@ -82,6 +83,9 @@ public class AIQuestionServiceImpl extends ServiceImpl<AIQuestionMapper, AIQuest
     @Resource
     private CusTableColumnService cusTableColumnService;
 
+    @Resource
+    private BusReportStoreMapper busReportStoreMapper;
+
     @Resource
     private DataSource dataSource;
 
@@ -522,6 +526,19 @@ public class AIQuestionServiceImpl extends ServiceImpl<AIQuestionMapper, AIQuest
         return httpRespMsg;
     }
 
+    @Override
+    public HttpRespMsg getCusReportForm(HttpServletRequest request) {
+        HttpRespMsg msg = new HttpRespMsg();
+        User user = userMapper.selectById(request.getHeader("token"));
+        FormStorePageBO queryBO = new FormStorePageBO();
+        queryBO.setUserId(user.getId());
+        queryBO.setCompanyId(user.getCompanyId());
+        queryBO.setDepartmentId(user.getDepartmentId());
+        List<BusReportStore> list = busReportStoreMapper.getCusReportForm(queryBO);
+        msg.setData(list);
+        return msg;
+    }
+
     public static List<Map<String, Object>> convertListWithAlias(ResultSet rs) {
         List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
         try {

fhKeeper/formulahousekeeper/management-crm/src/main/resources/mapper/BusReportStoreMapper.xml

@@ -33,4 +33,21 @@
                         left join user u2 on tmp.update_by = u2.id
         order by store_type asc,order_item asc
     </select>
+    <select id="getCusReportForm" resultType="com.management.platform.entity.BusReportStore">
+        select  brs.id,brs.store_type,brs.store_name,brs.parent_store_id,brs.create_by,brs.create_time
+             ,brs.update_by,brs.update_time,brs.description
+             ,brs.order_item,brs.relate_form_id,brs.company_id
+        from bus_report_store brs
+                 left join cus_report_form crf on brs.relate_form_id = crf.id
+        where store_type = 2 and brs.company_id = #{queryBO.companyId}
+          and (
+            crf.privilege = 1 or (crf.privilege = 2 and
+                                  exists(
+                                      select 1 from report_form_access rfa where brs.relate_form_id = rfa.relate_form_id
+                                      and (rfa.user_id =#{queryBO.userId} or rfa.department_id = #{queryBO.departmentId} )
+                                  )
+                )
+            )
+        order by brs.parent_store_id asc,order_item asc
+    </select>
 </mapper>

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java

@@ -10902,6 +10902,10 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                         //不一致
                         if (Math.abs(corpwxTime.getWorkHours() - report.getWorkingTime()) > 0.01) {
                             isMatch = false;
+                            //设置人员姓名
+                            if (corpwxTime.getName() == null) {
+                                corpwxTime.setName(targetUser.getName());
+                            }
                         }
                         break;
                     }
@@ -10910,7 +10914,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
 
             if (!isMatch) {
                 Map<String, Object> map = new HashMap<>();
-                map.put("name", corpwxTime.getName()==null?corpwxTime.getCorpwxUserid():corpwxTime.getName());
+                map.put("name", corpwxTime.getName());
                 map.put("createDate", dateTimeFormatter.format(corpwxTime.getCreateDate()));
                 map.put("workHours", corpwxTime.getWorkHours());
                 map.put("reportTime", reportTime);