修改

src/main/java/com/dashitech/migration/task/category/IncidentCategoryConfigTask.java

@@ -7,7 +7,6 @@ import com.dashitech.migration.task.uc.GroupTask;
 import com.dashitech.migration.task.uc.HospitalTask;
 import com.dashitech.migration.task.uc.UserTask;
 import com.dashitech.migration.util.JdbcUtil;
-import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -48,12 +47,16 @@ public class IncidentCategoryConfigTask extends BaseTask {
             sql.append(" WHERE a.branch_id <> 4 ");
         }
         List<Map<String, Object>> categoryConfigList = jdbcTemplateMdv2.queryForList(sql.toString());
-        FieldMapper mapper = new FieldMapper();
-        if (CollectionUtils.isEmpty(categoryConfigList)) {
-            sql = new StringBuffer("select version,id as category_id,_priority as priority,_group as group_id,userOrGroupType as user_group,handle_user as user_id,");
-            sql.append("NOW() as add_time,branch_id as hos_id,duty_dept as duty_id FROM itsm_incident_category");
-            categoryConfigList = jdbcTemplateMdv2.queryForList(sql.toString());
+        //查询故障现象表的配置数据
+        sql = new StringBuffer("select version,id as category_id,_priority as priority,_group as group_id,userOrGroupType as user_group,handle_user as user_id,");
+        sql.append("NOW() as add_time,branch_id as hos_id,duty_dept as duty_id FROM itsm_incident_category");
+        if ("xiangyang".equals(appName)) {
+            sql.append(" WHERE branch_id <> 4 ");
         }
+        List<Map<String, Object>> list = jdbcTemplateMdv2.queryForList(sql.toString());
+        categoryConfigList.addAll(list);
+
+        FieldMapper mapper = new FieldMapper();
         mapper.addOperationAdd("score", getDicId(jdbcTemplateHsms,"incident_category_score","1"));
         mapper.addOperationReplace("priority", dictionaryTask.loadCache().getIdCache());
         mapper.addOperationReplace("duty_id", hospitalTask.loadCache().getIdCache());

src/main/java/com/dashitech/migration/task/category/IncidentCategoryTask.java

@@ -23,7 +23,7 @@ public class IncidentCategoryTask extends BaseTask {
     @Transactional(rollbackFor = Exception.class)
     public void start() {
         StringBuffer sql = new StringBuffer("SELECT id,version,category,parentid as parent,delete_flag,quanPinyin as qp,suoPinyin as jp,now() as add_time,");
-        sql.append("hierarchy,muti_category,muti_suoPinyin as muti_jp,muti_quanPinyin as muti_qp,IFNULL(branch_id,1) as hos_id ");
+        sql.append("hierarchy,muti_category,muti_suoPinyin as muti_jp,muti_quanPinyin as muti_qp,IF(branch_id = 4,3,IFNULL(branch_id,1)) as hos_id ");
         sql.append(" FROM itsm_incident_category ");
         List<Map<String, Object>> categoryList = jdbcTemplateMdv2.queryForList(sql.toString());
 

src/main/java/com/dashitech/migration/task/uc/DepartmentTask.java

@@ -48,8 +48,9 @@ public class DepartmentTask extends BaseTask {
             FieldMapper deptMapper = this.loadCache();
             RowsWrap rw = DataMigrationter.getRowsWrap(mapper,deptMapper);
             JdbcUtil jdbcUtil = new JdbcUtil(jdbcTemplateHsms);
-            //科室只做更新 已有的科室不做处理
+
             jdbcUtil.batchPageInsert("itsm_uc_dept", rw.getInsertRows());
+            jdbcUtil.batchPageUpdate("itsm_uc_dept", rw.getUpdateRows());
 
             mapper.clear();
             deptMapper.clear();

src/main/java/com/dashitech/migration/task/uc/UserTask.java

@@ -41,7 +41,12 @@ public class UserTask extends BaseTask {
 
         StringBuffer sb = new StringBuffer();
         sb.append(" select version,ACCOUNT,GENDER,NAME,PHONE,PWD,WEIXIN,DEPTID,delete_flag, ");
-        sb.append(" pinyin,py as 'input_code',online,duty_id as 'hospital_id', ");
+        sb.append(" pinyin,py as 'input_code',online, ");
+        if ("xiangyang".equals(appName)) {
+            sb.append("IF(branch_id == 4 or branch_id is null,3,branch_id)  as 'hospital_id',");
+        } else {
+            sb.append("duty_id as 'hospital_id',");
+        }
         sb.append(" duty_id as 'duty_dept',company as 'company_id',engineer ");
         sb.append(" from itsm_uc_user ");
         sb.append(" where ACCOUNT != 'dsadmin' ");