Merge branch 'hy-tobacco' of ssh://132.232.112.242:7022/zhangkb/indicators into hy-tobacco

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

@@ -69,9 +69,12 @@ public class DataEnterCtrl {
                 switch (groupObj.getObjType()) {
                     case Constants.OBJ_TYPE_ORG:
                         List<JSONObject> orgs = systemAuthService.getOrgByNos(idList);
-//                        for (JSONObject jo : orgs) {
-//
-//                        }
+                        for (JSONObject jo : orgs) {
+                            AuthModel authModel = new AuthModel();
+                            authModel.setName(jo.getString("name"));
+                            authModel.setId(jo.getString("no"));
+                            objs.add(authModel);
+                        }
                         break;
                 }
                 if (objs.isEmpty()) {
@@ -129,10 +132,11 @@ public class DataEnterCtrl {
                 //需要通过计算才能取得值的数据项跳过
                 continue;
             }
-            if (indicator.getIndSource() == Constants.INPUT_ONLINE) {
+//            if (indicator.getIndSource() == Constants.INPUT_ONLINE) {
                 for (AuthModel obj : objs) {
                     TaskIndValue value = new TaskIndValue();
                     value.setIndId(indicator.getIndId());
+                    value.setTaskId(task.getId());
                     value.setIndName(indicator.getIndName());
                     value.setValueTime(task.getValueTime());
                     value.setIndUnit(indicator.getIndUnit());
@@ -149,7 +153,7 @@ public class DataEnterCtrl {
                     }
                     list.add(value);
                 }
-            }
+//            }
         }
         return list;
     }

src/main/java/com/keymobile/indicators/model/mapper/indmapper/IndicatorsDataMapper.java

@@ -8,6 +8,7 @@ import org.apache.ibatis.annotations.Param;
 
 import com.keymobile.indicators.model.entity.indicators.IndicatorsData;
 
+import org.apache.ibatis.annotations.Param;
 import tk.mybatis.mapper.common.BaseMapper;
 
 @Mapper
@@ -17,7 +18,7 @@ public interface IndicatorsDataMapper extends BaseMapper<IndicatorsData>{
 	
 	public List<IndicatorsData> getIndDataByParam(Map<String,Object> param);
 
-	void batchCreateIndData(List<IndicatorsData> datas);
+	void batchCreateIndData(@Param("datas") List<IndicatorsData> datas);
 
 	public IndicatorsData getIndData(@Param("indId")String indId,
 			@Param("date")Integer date,@Param("compareObj")String compareObj);

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

@@ -372,6 +372,7 @@ public class TaskServiceImpl implements TaskService {
             data.setIndId(value.getIndId());
             data.setIndDesc(value.getIndName());
             data.setType("1");
+            data.setValue(value.getIndValue());
             data.setUnit(value.getIndUnit());
             data.setDim1Desc(value.getObjName());
             datas.add(data);
@@ -529,7 +530,7 @@ public class TaskServiceImpl implements TaskService {
                         List<TaskIndicator> taskIndicators = new ArrayList<>();
                         for (TaskRuleIndicator indicator : indicators) {
                             List<BaseIndDef> baseIndDefs =
-                                    this.indRelService.getRelByIndId(indicator.getIndId(), "0");
+                                    this.indRelService.getRelByIndId(indicator.getIndId(), "1");
                             getBaseIndDef(ruleId, null, baseIndDefs, taskIndicators);
                         }
                         if (CollectionUtils.isNotEmpty(taskIndicators)) {
@@ -555,14 +556,18 @@ public class TaskServiceImpl implements TaskService {
                                     break;
                                 } else {
                                     Task task = new Task();
+                                    task.setId(IdWorker.getStrId());
                                     task.setValueTime(valueTime);
-                                    task.setStatus(Constants.APPLY_STATE_DRAFT);
-                                    task.setIndicators(tis);
                                     task.setCreateTime(now);
+                                    task.setToRoleNames(rule.getToRoleNames());
                                     task.setCreator(userId);
                                     task.setUpdateTime(now);
                                     task.setUpdater(userId);
+                                    task.setStatus(Constants.APPLY_STATE_DRAFT);
+                                    task.setState(Constants.DATA_STATE_A);
+                                    task.setIndicators(tis);
                                     task.setNeedSelfEnter(false);
+                                    task.setHasChildren(false);
                                     task.setNeedSum(false);
                                     task.setEndDate(editEndDate);
                                     task.setAuditEndDate(auditEndDate);
@@ -583,6 +588,7 @@ public class TaskServiceImpl implements TaskService {
                                     }
                                     task.setEnterUsers(userIds.toString());
                                     task.setEnterUserNames(userNames.toString());
+                                    allTasks.add(task);
                                 }
                                 this.batchCreateTask(allTasks, valueTime, ruleId);
                                 rule.setLastActiveTime(now);
@@ -607,7 +613,8 @@ public class TaskServiceImpl implements TaskService {
         if (result.isSuccess()) {
             LogManager.logInfo(Constants.LOG_CONTEXT_API, "任务id:{},名字：{}下发成功", rule.getId(), rule.getName()  );
         } else {
-            LogManager.logInfo(Constants.LOG_CONTEXT_API, "任务id:{},名字：{}下发失败", rule.getId(), rule.getName()  );
+            LogManager.logInfo(Constants.LOG_CONTEXT_API, "任务id:{},名字：{}下发失败, {}",
+                    rule.getId(), rule.getName(), result.getMsg()  );
         }
         return result;
     }
@@ -622,6 +629,9 @@ public class TaskServiceImpl implements TaskService {
     private void getBaseIndDef(Integer ruleId, String parentIndId, List<BaseIndDef> baseIndDefs, List<TaskIndicator> taskIndicators) {
         if (CollectionUtils.isNotEmpty(baseIndDefs)) {
             for (BaseIndDef baseIndDef : baseIndDefs) {
+                if (baseIndDef == null) {
+                    continue;
+                }
                 TaskIndicator taskIndicator = new TaskIndicator();
                 taskIndicator.setIndFormula(baseIndDef.getIndFormat());
                 taskIndicator.setRuleId(ruleId);
@@ -629,6 +639,7 @@ public class TaskServiceImpl implements TaskService {
                 taskIndicator.setIndSource(baseIndDef.getIndSource());
                 taskIndicator.setIndUnit(baseIndDef.getIndUnit());
                 taskIndicator.setIndId(baseIndDef.getIndId());
+                taskIndicator.setIndName(baseIndDef.getIndName());
                 taskIndicator.setIndDept(baseIndDef.getIndDept());
                 if (!taskIndicators.contains(taskIndicator)) {
                     taskIndicators.add(taskIndicator);

src/main/resources/mybatis/mapping/IndicatorsDataMapper.xml

@@ -41,7 +41,7 @@
   		values
 		<foreach collection="datas" item="val" separator=",">
 			(
-			#{#{val.indId}, #{val.indDesc}, #{val.type}, #{val.batchNo}, #{val.dataType},#{val.unit},
+			#{val.indId}, #{val.indDesc}, #{val.type}, #{val.batchNo}, #{val.dataType},#{val.unit},
 			#{val.dim1},#{val.dim2},#{val.value},#{val.dim1Desc}
 			)
 		</foreach>

src/main/resources/mybatis/mapping/TaskIndicatorMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.keymobile.indicators.model.mapper.indicators.TaskIndicatorMapper">
     
 
-	<select id="getByTaskId" parameterType="java.lang.String" resultType="com.keymobile.indicators.model.entity.dataenter.ExcelObj" >
+	<select id="getByTaskId" parameterType="java.lang.String" resultType="com.keymobile.indicators.model.entity.dataenter.TaskIndicator" >
         select * 
         from data_enter_task_ind
         where task_id = #{taskId} and state = 1

src/main/resources/mybatis/mapping/TaskIndicatorValueMapper.xml

@@ -10,7 +10,7 @@
         values
         <foreach collection="valueList" item="val" separator=",">
             (#{val.id},#{val.taskId}, #{val.indId}, #{val.indName}, #{val.indUnit}, #{val.indSource},#{val.indValue},
-                #{val.valueTime},#{val.objId},#{val.objName},#{val.objType}, #{tempId}, #{status},
+                #{val.valueTime},#{val.objId},#{val.objName},#{val.objType}, #{val.tempId}, #{val.status},
                 #{val.state},#{val.creator},#{val.updater},#{val.createTime}, #{val.updateTime}
             )
         </foreach>