考核项等其他开发

VisualInspection/js/assess_management/assess_item.js

@@ -305,6 +305,7 @@ function loadData(nodedata) {
         }
     }
     $(".check_item_group").show();
+
     if(pnode[0] != null){
         dept_selectinput = new TreeSelect({
             element: '#check_item_select',
@@ -326,6 +327,15 @@ function addCheckItem() {
 
     var pid =   dept_selectinput!=null?dept_selectinput.value:null ;
 
+    if($(".check_item_group").is(":hidden")){
+        pid = null ;   
+    }
+
+    if(name == ""){
+        tip("请填写考核项名称");
+        return ;
+    }
+
     var data = {
         "name": name,
         "score":score,

VisualInspection/js/config.js

@@ -1,4 +1,4 @@
-var base_ui_url = "http://localhost:8081/";
+var base_ui_url = "http://localhost:8080/";
 var base_server_url = "http://localhost:8089/";
 
 

VisualInspection/js/teamClass/charge_team_schedule.js

@@ -32,7 +32,7 @@
                 var newEvents = [];
                 // console.log(data);
                 for(var i=0;i<data.length;i++){
-                    var obj = {id:data[i].id ,desc:data[i].team_name ,title: data[i].team_name+"-"+getTeamName(data[i].class_type),  start: timeStamp2String(data[i].start_time,"yyyy-MM-dd"), end: timeStamp2String(data[i].end_time,"yyyy-MM-dd")};
+                    var obj = {id:data[i].id ,desc:data[i].team_name ,title: data[i].team_name+"-"+getTeamName(data[i].class_type),  start: data[i].start_time, end: data[i].end_time};
                     newEvents.push(obj);
                 }
                 calendar.addEvents(newEvents);

VisualInspection/js/teamClass/check_team_schedule.js

@@ -11,6 +11,7 @@
         var date_cursor = 0 ;
 
         // var user = $.zui.store.get("user") ;  // 缓存用户信息，取出dept_id
+        // console.log(user );
 
         $('#calendar').calendar();
         var calendar = $('#calendar').data('zui.calendar');
@@ -29,11 +30,12 @@
             }
             getTeamClass(data,function(data){
                 var newEvents = [];
-                // console.log(data);
+                 console.log(data);
                 for(var i=0;i<data.length;i++){
-                    var obj = {id:data[i].id ,desc:data[i].team_name ,title: data[i].team_name+"-"+getTeamName(data[i].class_type),  start: timeStamp2String(data[i].start_time,"yyyy-MM-dd"), end: timeStamp2String(data[i].end_time,"yyyy-MM-dd")};
+                    var obj = {id:data[i].id ,desc:data[i].team_name ,title: data[i].team_name+"-"+getTeamName(data[i].class_type),  start: data[i].start_time, end: data[i].end_time};
                     newEvents.push(obj);
                 }
+                console.log(newEvents)
                 calendar.addEvents(newEvents);
             })
         }

VisualInspection/view/assess_management/assess_item.html

@@ -59,7 +59,7 @@
                         <div class="form-group">
                             <label for="exampleInputAccount4" class="col-sm-2">分数：</label>
                             <div class="col-md-6 col-sm-10">
-                                <input type="text" id="check_item_score" class="form-control" placeholder="分数">
+                                <input type="text" id="check_item_score" class="form-control" placeholder="分数 / 目录可不填">
                             </div>
                         </div>
                         <div class="form-group check_item_group">

VisualInspection_server/src/main/java/com/xintong/visualinspection/bean/CheckRule.java

@@ -23,6 +23,8 @@ public class CheckRule {
     //被考核部门id
     private Long checked_dept_id;
     
+    private String checked_dept_name ;
+    
     // 考核项数量
     private int checked_item_num ;
 }

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/CheckRuleItemController.java

@@ -48,7 +48,7 @@ public class CheckRuleItemController extends BaseController {
      */
     @RequestMapping(value = "/delete")
     public String delete(@RequestBody CheckItem checkItem){
-    	if(checkItem.getId() ==null){
+    	if(checkItem.getId() ==null && checkItem.getRule_id()==null){
     		throw new BusinessException(20002);
     	}
     	checkRuleItemService.delete(checkItem);

VisualInspection_server/src/main/java/com/xintong/visualinspection/dao/master/CheckRuleItemDao.java

@@ -13,5 +13,7 @@ public interface CheckRuleItemDao  {
     public void insert(CheckItem checkItem);
    
     public void delete(CheckItem checkItem);
+    
+    public Integer selectItemCount(CheckItem checkItem);
    
 }

VisualInspection_server/src/main/java/com/xintong/visualinspection/mapper/master/CheckRuleItemMapper.xml

@@ -18,4 +18,10 @@
         rule_id=#{rule_id} and item_id=#{id}
     </delete>
     
+    <select id="selectItemCount" parameterType="com.xintong.visualinspection.bean.CheckItem" resultType="java.lang.Integer">
+    	SELECT COUNT(1) FROM check_rule_item 
+    	WHERE
+    	rule_id=#{rule_id} and item_id=#{id}
+    </select>
+    
 </mapper>

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/CheckRuleItemService.java

@@ -15,6 +15,6 @@ import com.xintong.visualinspection.bean.CheckItem;
  *
  */
 public interface CheckRuleItemService {
-    public void insert(CheckItem checkItem);
+    public String insert(CheckItem checkItem);
     public void delete(CheckItem checkItem);
 }

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/impl/CheckItemServiceImpl.java

@@ -48,6 +48,10 @@ public class CheckItemServiceImpl extends BaseService implements CheckItemServic
 				}
 				checkItemList.add(o);
 				map.put(o.getParent_id(), checkItemList);
+			}else{
+				if(!map.containsKey(o.getId())){
+					map.put(o.getId(), new ArrayList<>());
+				}
 			}
 		}
 		// 找出子

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/impl/CheckRuleItemServiceImpl.java

@@ -32,10 +32,15 @@ public class CheckRuleItemServiceImpl extends BaseService implements CheckRuleIt
 
 
 	@Override
-	public void insert(CheckItem checkItem) {
+	public String insert(CheckItem checkItem) {
 		// TODO Auto-generated method stub
+		// 避免插入数据重复
+		Integer hasCount = checkRuleItemDao.selectItemCount(checkItem) ;
+		if(hasCount >0){
+			return "数据已存在";
+		}
 		checkRuleItemDao.insert(checkItem);
-		
+		return null ;
 	}
   
 }

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/impl/CheckRuleServiceImpl.java

@@ -12,10 +12,12 @@ import org.springframework.stereotype.Service;
 
 import com.xintong.visualinspection.bean.CheckItem;
 import com.xintong.visualinspection.bean.CheckRule;
+import com.xintong.visualinspection.bean.Organ;
 import com.xintong.visualinspection.dao.master.CheckItemDao;
 import com.xintong.visualinspection.dao.master.CheckRuleDao;
 import com.xintong.visualinspection.service.BaseService;
 import com.xintong.visualinspection.service.CheckRuleService;
+import com.xintong.visualinspection.util.CacheUtil;
 
 /**
  * 文件名：UserServiceImpl
@@ -96,6 +98,10 @@ public class CheckRuleServiceImpl extends BaseService implements CheckRuleServic
 				}
 				checkItemList.add(o);
 				map.put(o.getParent_id(), checkItemList);
+			}else{
+				if(!map.containsKey(o.getId())){
+					map.put(o.getId(), new ArrayList<>());
+				}
 			}
 		}
 		// 找出子
@@ -153,6 +159,17 @@ public class CheckRuleServiceImpl extends BaseService implements CheckRuleServic
 
 	@Override
 	public List<CheckRule> getAllAndCountItem(CheckRule checkRule) {
-		return checkRuleDao.getAllAndCountItem(checkRule);
+		
+		List<CheckRule> lists = checkRuleDao.getAllAndCountItem(checkRule);
+		for(CheckRule c:lists){
+			if(c.getChecked_dept_id()!=null){
+				Organ obj = CacheUtil.deptMap.get(c.getChecked_dept_id());
+				if(obj!=null){
+					c.setChecked_dept_name(obj.getOrganname());					
+				}
+				
+			}
+		}
+		return  lists;
 	}
 }