Merge remote-tracking branch 'origin/dev' into dev

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/common/service/impl/MessageLogServiceImpl.java

@@ -91,13 +91,13 @@ public class MessageLogServiceImpl implements MessageLogService{
 
     private List<Messagelog> getListByMode(ListReqDTO req) {
         List<Messagelog> list = null;
-        Long companyId = BaseContextHolder.getCompanyId();
+        Long schoolId = BaseContextHolder.getSchoolId();
         String con = req.getFinalCondition();
         if (null == con) {
             con = "1=1";
         }
         if (null == req || StringUtils.isEmpty(req.getMode()) || "MAIN".equals(req.getMode())) {
-            list = messagelogMapper.selectMessageLog(con, companyId);
+            list = messagelogMapper.selectMessageLog(con, schoolId);
         }
         return list;
     }

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/wxschool/basic/service/impl/WxOaLeaveServiceImpl.java

@@ -72,18 +72,13 @@ public class WxOaLeaveServiceImpl implements WxOaLeaveService {
                 List<Long> longs = JSON.parseArray(lvNotifier, Long.class);
                 for (Long teacherId : longs) {
                     TeacherDO teacherDO = teacherMapper.get(teacherId);
-                    System.err.println("teacherDO===="+teacherDO);
                     SchoolDO schoolDO = wxSchoolMapper.get(teacherDO.getSchoolId());
-                    System.err.println("schoolDO======"+schoolDO);
                     String stuName = studentMapper.get(lvProposer).getStuName();
-                    System.err.println("stuName======"+stuName);
                     SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
                     String date =format.format(leave.getStartDate())  + "至" + format.format(leave.getEndDate());
-                    System.err.println("date======"+date);
                     try {
-                        wxPushApi.wxPush(schoolDO.getSchoolAppid(), schoolDO.getSchoolSecret(), teacherDO.getOpenid(), "QC8H4hQd1Fh0wqaaE3mbAxvoBC6y-XkHctIe8Kx6gcA", "您好，您有一个来自家长的请假申请",stuName,date, leave.getLvDetails(), "", "点击查看详情", "https://school-wechat.ubtob.com/leavedetail/teacher/" + leave.getLvId());
+                        wxPushApi.wxPush(schoolDO.getSchoolAppid(), schoolDO.getSchoolSecret(), teacherDO.getOpenid(), "QC8H4hQd1Fh0wqaaE3mbAxvoBC6y-XkHctIe8Kx6gcA","您好，学生的请假申请", stuName, date, leave.getLvDetails(), "-", "点击查看详情", "https://school-wechat.ubtob.com/leavedetail/teacher/" + leave.getLvId());
                     }catch (Exception e){
-                        System.err.println("e======="+e);
                         e.printStackTrace();
                     }
                 }

frontend/pc-web/app/model/basic/StudentParents.js

@@ -51,5 +51,8 @@ Ext.define('school.model.basic.StudentParents', {
     }, {
         name: 'user_id',
         type: 'int'
+    }, {
+        name: 'parent_rel',
+        type: 'string'
     }],
 });

frontend/pc-web/app/view/Interaction/homework/List.js

@@ -45,7 +45,40 @@ Ext.define('school.view.interaction.homework.List', {
                 hiddenTools: false,
                 toolBtns: [{
                     xtype: 'button',
-                    text: '删除'
+                    text: '删除',
+                    handler: function() {
+                        let grid = this.up('grid'),
+                        selectedRecords = grid.getSelection();
+                        let data;
+
+                        data = selectedRecords.map(function(r) {
+                            return {
+                                id: r.get('task_id')
+                            };
+                        });
+
+                        if(data.length == 0) {
+                            school.util.BaseUtil.showErrorToast('请先勾选需要删除的记录');
+                            return;
+                        }
+
+                        grid.setLoading(true);
+                        school.util.BaseUtil.request({
+                            // url: 'http://10.1.80.47:9560/teacher/batchDelete',
+                            url: '/api/school/homework/batchDelete',
+                            method: 'POST',
+                            params: JSON.stringify({
+                                baseDTOs: data
+                            })
+                        }).then(function(res) {
+                            grid.setLoading(false);
+                            school.util.BaseUtil.showSuccessToast('成功删除' + data.length + '条记录');
+                            grid.store.loadPage(grid.store.currentPage);
+                        }).catch(function(e) {
+                            grid.setLoading(false);
+                            school.util.BaseUtil.showErrorToast('删除失败: ' + e.message);
+                        });
+                    }
                 }, {
                     xtype: 'button',
                     text: '新增',

frontend/pc-web/app/view/Interaction/notice/List.js

@@ -46,7 +46,40 @@ Ext.define('school.view.interaction.notice.List', {
                 hiddenTools: false,
                 toolBtns: [{
                     xtype: 'button',
-                    text: '删除'
+                    text: '删除',
+                    handler: function() {
+                        let grid = this.up('grid'),
+                        selectedRecords = grid.getSelection();
+                        let data;
+
+                        data = selectedRecords.map(function(r) {
+                            return {
+                                id: r.get('notify_id')
+                            };
+                        });
+
+                        if(data.length == 0) {
+                            school.util.BaseUtil.showErrorToast('请先勾选需要删除的记录');
+                            return;
+                        }
+
+                        grid.setLoading(true);
+                        school.util.BaseUtil.request({
+                            // url: 'http://10.1.80.47:9560/teacher/batchDelete',
+                            url: '/api/school/notice/batchDelete',
+                            method: 'POST',
+                            params: JSON.stringify({
+                                baseDTOs: data
+                            })
+                        }).then(function(res) {
+                            grid.setLoading(false);
+                            school.util.BaseUtil.showSuccessToast('成功删除' + data.length + '条记录');
+                            grid.store.loadPage(grid.store.currentPage);
+                        }).catch(function(e) {
+                            grid.setLoading(false);
+                            school.util.BaseUtil.showErrorToast('删除失败: ' + e.message);
+                        });
+                    }
                 }, {
                     xtype: 'button',
                     text: '新增',

frontend/pc-web/app/view/basic/class/ClassDetail.js

@@ -10,11 +10,8 @@ Ext.define('school.view.basic.class.ClassDetail', {
     _codeField: null,
 
     _readUrl: '/api/school/class/read',
-    _saveUrl: '/api/purchase/purchase/save',
-    _auditUrl: '/api/purchase/purchase/audit',
-    _unAuditUrl: '/api/purchase/purchase/unAudit',
-    _deleteUrl: '/api/purchase/purchase/delete',
-    _turnInUrl: '/api/purchase/purchase/turnProdin',
+    _saveUrl: '/api/school/class/save',
+    _deleteUrl: '/api/school/class/delete',
 
     initId: 0,
     initComponent: function () {

frontend/pc-web/app/view/basic/class/ClassInfoController.js

@@ -108,7 +108,7 @@ Ext.define('school.view.basic.class.ClassInfoController', {
         store = tree.store,
         record = store.getAt(row);
 
-        me.showTreeAddWin(record.data, record);
+        me.showTreeAddWin(record);
 
     },
 
@@ -156,17 +156,18 @@ Ext.define('school.view.basic.class.ClassInfoController', {
         });
     },
 
-    showTreeAddWin: function(data, record) {
+    showTreeAddWin: function(record, count) {
         let me = this,
         view = me.getView(),
         refs = me.getReferences(),
         treeList = refs.treelist,
         listCard = refs.listcard,
         win = refs.treeaddwin,
+        data = record.data,
         id = data.id,
         _id = data._id,
         type = data.type,
-        childCount = record.childNodes.length;
+        childCount = count >= 0 ? count : record.childNodes.length;
 
         let title = type == 'SCHOOL' ? '新增年级' : '新增班级';
         let sumType = type == 'SCHOOL' ? 'GRADE' : 'CLASS';

frontend/pc-web/app/view/basic/class/ListCard.js

@@ -91,9 +91,11 @@ Ext.define('school.view.basic.class.ListCard', {
             cardList = Ext.Array.merge(list, [{
                 addBtn: true,
                 id: node.data.id,
+                _id: node.data._id,
                 type: node.data.type,
                 itemCls: 'item-add',
-                textCls: 'text-add x-ss ss-add'
+                textCls: 'text-add x-ss ss-add',
+                count: list.length
             }]);
 
             currentlist.loadData(cardList);

frontend/pc-web/app/view/basic/class/ListCardController.js

@@ -22,7 +22,7 @@ Ext.define('school.view.basic.class.ListCardController', {
         var node;
 
         if(!!record.get('addBtn')) {
-            classInfoController.showTreeAddWin(record.data);
+            classInfoController.showTreeAddWin(record, record.get('count'));
         }else {
             node = rootNode.findChild('id', record.get('id'), true);
             view.showNode(node);

frontend/pc-web/app/view/basic/staff/StaffDetail.js

@@ -35,9 +35,17 @@ Ext.define('school.view.basic.staff.StaffDetail', {
                 name: 'teacher_name',
                 fieldLabel: '姓名'
             }, {
-                xtype: "textfield",
-                name: "teacher_sex",
-                fieldLabel: "性别"
+                xtype: 'combobox',
+                name: 'teacher_sex',
+                fieldLabel: '性别',
+                displayField: 'name',
+                valueField: 'value',
+                editable: false,
+                store: {
+                    type: 'store_gender'
+                },
+                minChars: 0,
+                queryMode: 'local'
             }, {
                 xtype: 'textfield',
                 name: 'teacher_phone',

frontend/pc-web/app/view/basic/staff/StaffList.js

@@ -9,15 +9,15 @@ Ext.define('school.view.basic.staff.StaffList', {
     _title: '教职工信息导入',
     caller: 'Teacher',
     pathKey: 'teacher',
-    
 
-    initComponent: function() {
+
+    initComponent: function () {
         var me = this;
         Ext.apply(this, {
             searchField: [{
                 xtype: 'textfield',
                 name: 'code',
-                fieldLabel:'教职工号'
+                fieldLabel: '教职工号'
             }, {
                 xtype: 'textfield',
                 name: 'name',
@@ -27,7 +27,7 @@ Ext.define('school.view.basic.staff.StaffList', {
                 name: 'job',
                 fieldLabel: '职位'
             }],
-        
+
             gridConfig: {
                 addTitle: '教职工信息',
                 addXtype: 'basic-staff-staffdetail',
@@ -39,10 +39,10 @@ Ext.define('school.view.basic.staff.StaffList', {
                 totalProperty: 'data.total',
                 actionColumn: [],
                 selModel: {
-                    checkOnly:true,
-                    type:'checkboxmodel',
-                    mode : "MULTI" ,
-                    ignoreRightMouseSelection : false
+                    checkOnly: true,
+                    type: 'checkboxmodel',
+                    mode: "MULTI",
+                    ignoreRightMouseSelection: false
                 },
                 hiddenTools: false,
                 toolBtns: [{
@@ -50,7 +50,7 @@ Ext.define('school.view.basic.staff.StaffList', {
                     belong: me,
                     caller: me.caller,
                     pathKey: me.pathKey,
-                    onSuccess: function() {
+                    onSuccess: function () {
                         //刷新界面
                         var g = me.down('grid');
                         g.store.loadPage(g.store.currentPage);
@@ -61,18 +61,18 @@ Ext.define('school.view.basic.staff.StaffList', {
                 }, {
                     xtype: 'button',
                     text: '删除',
-                    handler: function() {
+                    handler: function () {
                         let grid = this.up('grid'),
-                        selectedRecords = grid.getSelection();
+                            selectedRecords = grid.getSelection();
                         let data;
 
-                        data = selectedRecords.map(function(r) {
+                        data = selectedRecords.map(function (r) {
                             return {
                                 id: r.get('teacher_id')
                             };
                         });
 
-                        if(data.length == 0) {
+                        if (data.length == 0) {
                             school.util.BaseUtil.showErrorToast('请先勾选需要删除的记录');
                             return;
                         }
@@ -85,11 +85,11 @@ Ext.define('school.view.basic.staff.StaffList', {
                             params: JSON.stringify({
                                 baseDTOs: data
                             })
-                        }).then(function(res) {
+                        }).then(function (res) {
                             grid.setLoading(false);
                             school.util.BaseUtil.showSuccessToast('成功删除' + data.length + '条记录');
                             grid.store.loadPage(grid.store.currentPage);
-                        }).catch(function(e) {
+                        }).catch(function (e) {
                             grid.setLoading(false);
                             school.util.BaseUtil.showErrorToast('删除失败: ' + e.message);
                         });
@@ -97,11 +97,11 @@ Ext.define('school.view.basic.staff.StaffList', {
                 }, {
                     xtype: 'button',
                     text: '新增',
-                    handler: function() {
+                    handler: function () {
                         school.util.BaseUtil.openTab('basic-staff-staffdetail', '新增教职工信息', 'basic-staff-staffdetail-add');
                     }
                 }],
-                columns : [{
+                columns: [{
                     text: 'ID',
                     dataIndex: 'teacher_id',
                     hidden: true
@@ -120,7 +120,7 @@ Ext.define('school.view.basic.staff.StaffList', {
                 }, {
                     text: '性别',
                     dataIndex: 'teacher_sex',
-                    renderer: function(v, m, r) {
+                    renderer: function (v, m, r) {
                         return v == 1 ? '男' : (v == 0 ? '女' : '未知');
                     }
                 }, {
@@ -172,33 +172,33 @@ Ext.define('school.view.basic.staff.StaffList', {
         return conditionValue;
     },
 
-    getExtraParams: function(store, op, condition) {
+    getExtraParams: function (store, op, condition) {
         var temp = {};
 
-        for(let x = 0; x < condition.length; x++) {
+        for (let x = 0; x < condition.length; x++) {
             let c = condition[x];
-            if(c.field == 'keyword') {
+            if (c.field == 'keyword') {
                 temp.keyword = c.value;
-            }else if(c.field == 'date') {
+            } else if (c.field == 'date') {
                 temp.fromDate = new Date(c.value.split(',')[0]).getTime();
                 temp.endDate = new Date(c.value.split(',')[1]).getTime();
-            }else if(c.field == 'quoted') {
+            } else if (c.field == 'quoted') {
                 temp.quoted = c.value == 'all' ? null : c.value;
-            }else if(c.field == 'closed') {
+            } else if (c.field == 'closed') {
                 // temp.endDate = c.value == 'all' ? null : (
                 //     c.value == '0' ? 
                 // );
             }
         }
         let obj = {
-            pageNumber: store.exportNumber?store.exportNumber:op._page,
-            pageSize: store.exportPageSize?store.exportPageSize:store.pageSize
+            pageNumber: store.exportNumber ? store.exportNumber : op._page,
+            pageSize: store.exportPageSize ? store.exportPageSize : store.pageSize
         };
-        for(let k in temp) {
-            if(!!temp[k]) {
+        for (let k in temp) {
+            if (!!temp[k]) {
                 obj[k] = temp[k];
             }
         }
         return obj;
-     },
+    },
 });

frontend/pc-web/app/view/basic/student/StudentDetail.js

@@ -13,7 +13,7 @@ Ext.define('school.view.basic.student.StudentDetail', {
     _statusCodeField: null,
     _auditmanField: null,
     _auditdateField: null,
-    // _readUrl: 'http://10.1.80.35:8560/api/sale/saledown/read',
+    // _readUrl: 'http://10.1.80.47:9560/student/read',
     _readUrl: '/api/school/student/read',
     // _saveUrl: 'http://10.1.80.47:9560/student/save',
     _saveUrl: '/api/school/student/save',
@@ -24,6 +24,10 @@ Ext.define('school.view.basic.student.StudentDetail', {
     initComponent: function () {
         Ext.apply(this, {
             defaultItems: [{
+                xtype: 'hidden',
+                name: 'stu_id',
+                fieldLabel: 'id',
+            }, {
                 xtype: 'textfield',
                 name: 'stu_number',
                 fieldLabel: '学号'
@@ -90,13 +94,18 @@ Ext.define('school.view.basic.student.StudentDetail', {
             }, {
                 name: "parent",
                 xtype: "detailGridField",
-                idColumn: 'parent_id',
+                idColumn: 'parent_stu_id',
                 detnoColumn: 'sd_detno',
                 storeModel: 'school.model.basic.StudentParents',
-                deleteDetailUrl: '/api/sale/sale/deleteDetail',
+                // deleteDetailUrl: 'http://10.1.80.47:9560/student/deleteDetail',
+                deleteDetailUrl: '/api/school/student/deleteDetail',
                 allowEmpty: true,
                 showCount: false,
                 columns: [{
+                    text: '家长姓名',
+                    dataIndex: 'parent_stu_id',
+                    hidden: true
+                }, {
                     text: '家长姓名',
                     dataIndex: 'parents_name',
                     editor: {

frontend/pc-web/app/view/core/base/BasePanel.js

@@ -113,6 +113,14 @@ Ext.define('school.view.core.base.BasePanel', {
         grid.store.loadPage(1);
     },
 
+    getExtraParams: function(store, op, condition) {
+        let obj = {
+            pageNumber: store.exportNumber?store.exportNumber:op._page,
+            pageSize: store.exportPageSize?store.exportPageSize:store.pageSize
+        };
+        return obj;
+     },
+
     /**
      * 获得过滤条件
      */

frontend/pc-web/app/view/setting/operatelog/OperateLog.js

@@ -6,7 +6,7 @@ Ext.define('school.view.setting.operatelog.OperateLog', {
     xtype: 'setting-operatelog-operatelog',
 
     viewName: 'setting-operatelog-operatelog',
-    dataUrl: '/api/commons/operatelog/list',
+    dataUrl: '/api/school/messagelog/list',
     initComponent: function () {
         var me = this;
         Ext.apply(this, {
@@ -16,12 +16,12 @@ Ext.define('school.view.setting.operatelog.OperateLog', {
                 xtype: 'textfield',
                 emptyText : '对象',
             }, {
-                columnWidth: 0.5,
-                name: 'time',
-                xtype: 'condatefield',
-                fieldLabel : '时间',
-                labelWidth: 50
-            }, {
+            //     // columnWidth: 0.5,
+            //     // name: 'time',
+            //     // xtype: 'condatefield',
+            //     // fieldLabel : '时间',
+            //     // labelWidth: 50
+            // }, {
                 width: 110,
                 name: 'man',
                 xtype: 'textfield',