bugfix

VisualInspection/fwq/view/main.html

@@ -8,6 +8,7 @@
 
     <link rel="import" href="/view/common/commoncsslink.html?__inline">
     <link rel="stylesheet" type="text/css" href="/css/main.css">
+    <link rel="import" href="/view/common/commonscriptlink.html?__inline">
 
     <!--<link rel="stylesheet" type="text/css" href="/js/lib/jedate/skin/jedate.css">
     <script src="/js/lib/jedate/jedate.js"></script>-->
@@ -80,7 +81,7 @@
 
         </div>
     </div>
-    <link rel="import" href="/view/common/commonscriptlink.html?__inline">
+
     <script src="/js/main.js"></script>
     <script src="/fwq/js/task/check.js"></script>
 

VisualInspection/fwq/view/task/taskDetail.html

@@ -484,6 +484,8 @@
         showPopup4Common('分配稽查员', function() {
             saveAssign();
         }, '400px', '#chooseCheckman-div');
+
+
         setCheckmanSelect('#choseCheckmanList', null, $.checkTask.checkman,
             function() {
                 $('#choseCheckmanList').chosen({

VisualInspection/js/util/util.js

@@ -572,6 +572,7 @@ function roleContains(role) {
 
 function setCheckmanSelect(div, selectId, notHaveUserId, callback) {
     post_common_service("/user/getAllCheckman", null, function(data) {
+        console.error(data)
         var optStr = '';
         for (var i in data) {
             if (data[i].id == notHaveUserId) continue;

Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/service/impl/TaskService_QImpl.java

@@ -212,7 +212,7 @@ public  class TaskService_QImpl implements TaskService_Q {
                     q.setRule_id(6);
                     q.setChecked_users(s.getUsers());
                     q.setUpdate_user((long) taskData_f.getUser_id());
-                    if (p != null && p.getEndtime().getTime() > s.getStart_time().getTime()) {
+                    if (p != null && p.getEndtime().getTime() > s.getReceived_time().getTime()) {
                         q.setPeriod_id(p.getId());
                     }
                     qzdTaskDao.addtask(q);