增加数据填报拉取参考数据

src/main/java/com/keymobile/indicators/api/hytobacco/DataEnterCtrl.java

@@ -62,8 +62,6 @@ public class DataEnterCtrl {
     @GetMapping("findToEdit")
     public List<TaskIndValue> findToEdit(@RequestParam("taskId") String taskId) throws Exception {
 
-
-
         List<TaskIndValue> list = new ArrayList<>();
         Task task = taskService.getById(taskId, true, false);
         List<TaskIndicator> taskIndicators = task.getIndicators();
@@ -119,13 +117,13 @@ public class DataEnterCtrl {
                                 taskService.findDefaultValues(valueTimeStr,sameTermValueTimeStr, indIds);
                         //查同期（精确值
                        List<TaskIndValue>  indLastCorrectValues =
-                            taskService.findDefaultValues(sameTermValueTimeStr,valueTimeStr, indIds);
+                            taskService.findDefaultValues(sameTermValueTimeStr,sameTermValueTimeStr, indIds);
                         list = genernateEditObjects(task, defaultValues, defaultLastValueValues,indLastCorrectValues, objs, groupObj.getObjType());
                     } else {
                         //查询精确值
                         List<TaskIndValue>  indLastCorrectValues =null;
                         if(oldValues.get(0).getIndLastCorrectValue()==null){
-                          indLastCorrectValues =taskService.findDefaultValues(sameTermValueTimeStr,valueTimeStr, indIds);
+                          indLastCorrectValues =taskService.findDefaultValues(sameTermValueTimeStr,sameTermValueTimeStr, indIds);
                         }
                         list = genernateEditObjects(task, oldValues, null, indLastCorrectValues,objs, groupObj.getObjType());
 
@@ -373,7 +371,12 @@ public class DataEnterCtrl {
         value.setValueTime(valueTime);
         value.setIndId(ind.getIndId());
         value.setIndUnit(ind.getIndUnit());
-        value.setIndName(ind.getIndName());
+        String indName=ind.getIndName();
+        //模板保存时指标名字加上了单位，去掉  hzc
+        if(StringUtils.isNotBlank(ind.getIndName())){
+            indName= indName.substring(0,indName.lastIndexOf("("));
+        }
+        value.setIndName(indName);
         value.setIndSource(ind.getIndSource());
         value.setIndValue(indValue);
         value.setTaskId(taskId);
@@ -567,5 +570,19 @@ public class DataEnterCtrl {
             }
         }
     }
-
+    @ApiOperation("查询中间表的值(填报点击获取中间数据)")
+    @PostMapping("findOldValueToEdit")
+    public List<TaskIndValue> findOldValueToEdit(@RequestBody List<TaskIndValue> values,@RequestParam("taskId") String taskId) {
+        List<TaskIndValueTmp> tmpValues= taskService.findOldValueToEdit(taskId);
+        for (TaskIndValue value : values) {
+            for (TaskIndValueTmp tmpValue : tmpValues) {
+                if(value.getIndId().equals(tmpValue.getIndId())
+                &&value.getObjId().equals(tmpValue.getObjId())){
+                    value.setIndLastValue(tmpValue.getIndLastValue());
+                    value.setIndValue(tmpValue.getIndValue());
+                }
+            }
+        }
+        return values;
+    }
 }

src/main/java/com/keymobile/indicators/api/hytobacco/ExcelTempCtrl.java

@@ -269,7 +269,7 @@ public class ExcelTempCtrl {
             Map<String,List<List<String>>> towDataMap = getTwoData(template);
 
             List<List<String>> headers2 = towDataMap.get("headers");
-            WriteSheet two = EasyExcel.writerSheet(1, "同期精确值").head(headers2).build();
+            WriteSheet two = EasyExcel.writerSheet(1, "同期历史口径值").head(headers2).build();
             build.write(datas,one);
             build.write(towDataMap.get("datas"),two);
             build.finish();
@@ -303,7 +303,7 @@ public class ExcelTempCtrl {
             indIds.add(indicator.getIndId());
         }
         List<TaskIndValue>  indLastCorrectValues =
-                taskService.findDefaultValues(sameTermValueTimeStr,valueTimeStr, indIds);
+                taskService.findDefaultValues(sameTermValueTimeStr,sameTermValueTimeStr, indIds);
 
         List<List<String>> datas = new ArrayList<>();
         List<List<String>> headers = new ArrayList<>();

src/main/java/com/keymobile/indicators/model/entity/dataenter/TaskIndValueTmp.java

+package com.keymobile.indicators.model.entity.dataenter;
+
+import com.keymobile.indicators.model.entity.BaseModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+
+/**
+ * 任务填报的数据项值
+ */
+@Data
+@Table(name="data_enter_task_ind_val_tmp")
+public class TaskIndValueTmp extends BaseModel {
+
+    @Id
+    private String id;
+
+    /**
+     * 任务关联数据项id
+     */
+    private String tiId;
+
+    /**
+     * 所属任务id
+     */
+    private String taskId;
+
+    /**
+     * 指标id
+     */
+    private String indId;
+
+    /**
+     * 指标名称
+     */
+    @ApiModelProperty("指标名称")
+    private String indName;
+
+    /**
+     * 指标单位
+     */
+    @ApiModelProperty("指标单位")
+    private String indUnit;
+
+    /**
+     * 指标数量来源：1 Excel导入 2 手工录入
+     */
+    private Integer indSource;
+
+    /**
+     * 指标值
+     */
+    @ApiModelProperty("指标值")
+    private String indValue;
+
+    /**
+     * 指标值
+     */
+    @ApiModelProperty("指标同期值")
+    private String indLastValue;
+
+    /**
+     * 数据时间，例如2020-06表示二季度
+     */
+    @ApiModelProperty("数据时间")
+    private String valueTime;
+
+    /**
+     * 数据对象id
+     */
+    @ApiModelProperty("数据对象id")
+    private String objId;
+
+    /**
+     * 数据对象类型：1、组织机构 2、人员
+     */
+    @ApiModelProperty("数据对象类型：1、组织机构 2、人员 3、岗位")
+    private Integer objType;
+
+    /**
+     * 数据项对象名称
+     */
+    @ApiModelProperty("数据对象名称")
+    private String objName;
+
+    @ApiModelProperty("备注")
+    private String description;
+
+    @ApiModelProperty("数据项归属部门")
+    @Transient
+    private String indDept;
+    /**
+     * excel导入对应的excel模板id
+     */
+    private Integer tempId;
+
+    /**
+     * 填报状态：3 审核通过
+     */
+    private Integer status;
+    /**
+     * 同期准确值
+     */
+    private String indLastCorrectValue;
+}

src/main/java/com/keymobile/indicators/model/mapper/indicators/TaskIndValueTmpMapper.java

+package com.keymobile.indicators.model.mapper.indicators;
+
+import com.keymobile.indicators.model.entity.dataenter.TaskIndValueTmp;
+import org.apache.ibatis.annotations.Mapper;
+import tk.mybatis.mapper.common.BaseMapper;
+
+/**
+ * TODO
+ *
+ * @author hzc
+ * @version 1.0
+ * @date 2021/1/8
+ */
+@Mapper
+public interface TaskIndValueTmpMapper extends BaseMapper<TaskIndValueTmp> {
+}

src/main/java/com/keymobile/indicators/service/dataenter/TaskService.java

@@ -220,4 +220,12 @@ public interface TaskService {
      * @Author hzc
      **/
     Result passTask();
+
+    /**
+     * 查询临时表数据-用途：填报时可以填充值（参考
+     * @Param [taskId]
+     * @Date 2021/1/8 15:32
+     * @Author hzc
+     **/
+    List<TaskIndValueTmp> findOldValueToEdit(String taskId);
 }

src/main/java/com/keymobile/indicators/service/dataenter/impl/TaskServiceImpl.java

@@ -82,6 +82,10 @@ public class TaskServiceImpl implements TaskService {
     private TaskRuleTargetRolesMapper taskRuleTargetRolesMapper;
     @Autowired
     private IndicatorsDataMapper indicatorsDataMapper;
+
+    @Autowired
+    private TaskIndValueTmpMapper taskIndValueTmpMapper;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Task createTask(Task task) {
@@ -907,6 +911,18 @@ public class TaskServiceImpl implements TaskService {
         log.info("===重新确认完成=:{}秒,完成确认任务数:{}",time,allTask.size());
         return null;
     }
+    /**
+     * 查询临时表数据-用途：填报时可以填充值（参考
+     * @Param [taskId]
+     * @Date 2021/1/8 15:32
+     * @Author hzc
+     **/
+    @Override
+    public List<TaskIndValueTmp> findOldValueToEdit(String taskId) {
+        TaskIndValueTmp taskIndValueTmpSql = new TaskIndValueTmp();
+        taskIndValueTmpSql.setTaskId(taskId);
+        return taskIndValueTmpMapper.select(taskIndValueTmpSql);
+    }
 
     /**
      * 获取关联的数据项和子数据项