补充提交

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

@@ -742,7 +742,7 @@ public class TaskController {
 //            queryWrapper.lt("end_date", LocalDate.now()).eq("task_status", 0);
 //        }
         List<Task> list = taskMapper.getTaskWithProjectName(queryWrapper, (pageIndex-1)*pageSize, pageSize,companyId,groupName);
-        int total = taskMapper.selectCount(queryWrapper);;
+        int total = taskMapper.selectCount(queryWrapper);
         Map<String, Object> map = new HashMap<>();
         map.put("records", list);
         map.put("total", total);

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/Task.java

@@ -1,20 +1,20 @@
 package com.management.platform.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import java.time.LocalDate;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-import java.util.List;
-
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.List;
+
 /**
  * <p>
  * 
@@ -203,6 +203,8 @@ public class Task extends Model<Task> {
     private List<MilestoneTaskRef> refTaskList;
     @TableField(exist = false)
     private Integer finishRefTaskCount;
+    @TableField(exist = false)
+    private String projectCategorySub;
 
     @Override
     protected Serializable pkVal() {

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

@@ -152,14 +152,14 @@ public class ProviderInfoServiceImpl extends ServiceImpl<ProviderInfoMapper, Pro
     public HttpRespMsg exportData(HttpServletRequest request) {
         User user = userMapper.selectById(request.getHeader("token"));
         List<List<String>> dataList=new ArrayList<>();
-        String[] titleString=new String[]{"供应商名称","供应商编码","分类","联系人","联系人电话","邮箱","地址","备注"};
+        String[] titleString=new String[]{"供应商编号","供应商名称","分类","联系人","联系电话","邮箱","地址","备注"};
         List<String> titleList = Arrays.asList(titleString);
         dataList.add(titleList);
         List<ProviderInfo> providerInfoList = providerInfoMapper.selectList(new QueryWrapper<ProviderInfo>().eq("company_id", user.getCompanyId()));
         for (ProviderInfo providerInfo : providerInfoList) {
             List<String> item=new ArrayList<>();
-            item.add(providerInfo.getProviderName()==null?"":providerInfo.getProviderName());
             item.add(providerInfo.getProviderCode()==null?"":providerInfo.getProviderCode());
+            item.add(providerInfo.getProviderName()==null?"":providerInfo.getProviderName());
             item.add(providerInfo.getProviderCategoryName()==null?"":providerInfo.getProviderCategoryName());
             item.add(providerInfo.getContactName()==null?"":providerInfo.getContactName());
             item.add(providerInfo.getContactPhone()==null?"":providerInfo.getContactPhone());

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

@@ -1345,9 +1345,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                     String s="";
                     for (int i = 0; i < certList.size(); i++) {
                         if(i<certList.size()-1){
-                            s+=certList.get(i).getCertName()+",";
+                            s+=certList.get(i).getCertName()+" "+certList.get(i).getCertDate()+",";
                         }else {
-                            s+=certList.get(i).getCertName();
+                            s+=certList.get(i).getCertName()+" "+certList.get(i).getCertDate();
                         }
                     }
                     row.createCell(7).setCellValue(s);

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/TaskMapper.xml

@@ -87,6 +87,7 @@
         <result column="project_name" property="projectName" />
         <result column="start_date" property="startDate" />
         <result column="stages_name" property="stagesName" />
+        <result column="project_category_sub" property="projectCategorySub" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -197,7 +198,11 @@
     </select>
 
     <select id="getTaskWithProjectName" resultMap="RichResultMap">
-        SELECT task.*, project.`project_name`, stages.stages_name FROM task LEFT JOIN project ON project.id = task.`project_id`
+        SELECT task.*, project.`project_name`, stages.stages_name
+        <if test="companyId==428">
+            ,ps.project_category_sub
+        </if>
+        FROM task LEFT JOIN project ON project.id = task.`project_id`
         left join stages on stages.id = task.stages_id
         <if test="companyId==428">
             left join project_separate ps on ps.id=task.project_id