Merge branch 'master' of 49.232.152.146:xhxy/smart_school

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolEquipment/SchoolEquipmentLedger.java

@@ -3,6 +3,8 @@ package yangtz.cs.liu.campus.domain.schoolEquipment;
 import java.math.BigDecimal;
 import java.util.Date;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.core.domain.OurBaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
@@ -75,9 +77,11 @@ public class SchoolEquipmentLedger extends OurBaseEntity
     private String place;
 
     /** 使用人id */
+    @TableField(fill = FieldFill.UPDATE)
     private Long useId;
 
     /** 使用人 */
+    @TableField(fill = FieldFill.UPDATE)
     private String useName;
 
     /** 备注 */

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolDepartmentBudget/SchoolDepartmentBudgetServiceImpl.java

@@ -2,6 +2,7 @@ package yangtz.cs.liu.campus.service.impl.schoolDepartmentBudget;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
@@ -88,6 +89,9 @@ public class SchoolDepartmentBudgetServiceImpl extends ServiceImpl<SchoolDepartm
     @Override
     public int insertSchoolDepartmentBudget(SchoolDepartmentBudgetVo schoolDepartmentBudget)
     {
+        if (StringUtils.isNull(schoolDepartmentBudget.getLeadershipId())){
+            throw new ServiceException("请选择分管领导");
+        }
         SysUser user = SecurityUtils.getLoginUser().getUser();
         schoolDepartmentBudget.setDeptId(user.getDeptId());
         schoolDepartmentBudget.setInformantId(user.getUserId());

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolEquipment/ReceiveServiceImpl.java

 package yangtz.cs.liu.campus.service.impl.schoolEquipment;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.utils.DateUtils;
@@ -8,7 +9,9 @@ import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.mapper.SysUserMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolEquipmentLedger;
 import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolReceive;
+import yangtz.cs.liu.campus.mapper.schoolEquipment.EquipmentLedgerMapper;
 import yangtz.cs.liu.campus.mapper.schoolEquipment.ReceiveMapper;
 import yangtz.cs.liu.campus.service.schoolEquipment.IReceiveService;
 import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolReceiveVo;
@@ -22,6 +25,8 @@ public class ReceiveServiceImpl extends ServiceImpl<ReceiveMapper, SchoolReceive
     private ReceiveMapper receiveMapper;
     @Autowired
     private SysUserMapper sysUserMapper;
+    @Autowired
+    private EquipmentLedgerMapper equipmentLedgerMapper;
 
     /**
      * 查看设备领用列表
@@ -54,6 +59,12 @@ public class ReceiveServiceImpl extends ServiceImpl<ReceiveMapper, SchoolReceive
         if (StringUtils.isNotNull(schoolReceive.getRecipientById())){
             String userName = sysUserMapper.selectUserById(schoolReceive.getRecipientById()).getUserName();
             schoolReceive.setRecipientBy(userName);
+            SchoolEquipmentLedger schoolEquipmentLedger = new SchoolEquipmentLedger();
+            schoolEquipmentLedger.setId(schoolReceive.getEquipmentId());
+            schoolEquipmentLedger.setAffiliationType("3");
+            schoolEquipmentLedger.setUseId(schoolReceive.getRecipientById());
+            schoolEquipmentLedger.setUseName(userName);
+            equipmentLedgerMapper.updateById(schoolEquipmentLedger);
         }
         if (StringUtils.isNotNull(schoolReceive.getReceivedById())){
             String userName = sysUserMapper.selectUserById(schoolReceive.getReceivedById()).getUserName();
@@ -74,11 +85,25 @@ public class ReceiveServiceImpl extends ServiceImpl<ReceiveMapper, SchoolReceive
         if (StringUtils.isNotNull(schoolReceive.getRecipientById())){
             String userName = sysUserMapper.selectUserById(schoolReceive.getRecipientById()).getUserName();
             schoolReceive.setRecipientBy(userName);
+            SchoolEquipmentLedger schoolEquipmentLedger = new SchoolEquipmentLedger();
+            schoolEquipmentLedger.setId(schoolReceive.getEquipmentId());
+            schoolEquipmentLedger.setAffiliationType("3");
+            schoolEquipmentLedger.setUseId(schoolReceive.getRecipientById());
+            schoolEquipmentLedger.setUseName(userName);
+            equipmentLedgerMapper.updateById(schoolEquipmentLedger);
         }
         if (StringUtils.isNotNull(schoolReceive.getReceivedById())){
             String userName = sysUserMapper.selectUserById(schoolReceive.getReceivedById()).getUserName();
             schoolReceive.setReceivedBy(userName);
         }
+        if (schoolReceive.getReturnState().equals("1")){
+            SchoolEquipmentLedger schoolEquipmentLedger = new SchoolEquipmentLedger();
+            schoolEquipmentLedger.setId(schoolReceive.getEquipmentId());
+            schoolEquipmentLedger.setAffiliationType("2");
+            schoolEquipmentLedger.setUseId(null);
+            schoolEquipmentLedger.setUseName(null);
+            equipmentLedgerMapper.updateById(schoolEquipmentLedger);
+        }
         schoolReceive.setUpdateBy(SecurityUtils.getLoginUser().getUser().getUserName());
         schoolReceive.setUpdateTime(DateUtils.getNowDate());
         return receiveMapper.updateById(schoolReceive);

smart-campus/src/main/resources/mapper/teacher/SchoolTeacherMapper.xml

@@ -45,7 +45,7 @@
 
     <select id="selectSchoolTeacherList" resultType="com.ruoyi.common.core.domain.entity.SchoolTeacher">
         select t.id,t.device_num,t.teacher_name, t.teacher_tel, t.teacher_code, t.id_card, t.home_address, t.nation, t.pic_url, t.birthday,
-        t.education, t.sex,u.dept_id,d.dept_name,u.status,u.sign,u.avatar
+        t.education, t.sex,u.dept_id,d.dept_name,u.status,u.sign,u.avatar,u.employee_type
         from school_teacher t
         left join sys_user u on t.id = u.user_id
         left join sys_dept d on u.dept_id = d.dept_id
@@ -342,7 +342,7 @@
 
     <select id="teacherList" resultType="com.ruoyi.common.core.domain.entity.SchoolTeacher">
         select t.id,t.device_num,t.teacher_name, t.teacher_tel, t.teacher_code, t.id_card, t.home_address, t.nation, t.pic_url, t.birthday,
-        t.education, t.sex,u.dept_id,d.dept_name,u.status,u.sign,u.avatar,u.user_id
+        t.education, t.sex,u.dept_id,d.dept_name,u.status,u.sign,u.avatar,u.user_id, u.employee_type
         from school_teacher t
         left join sys_user u on t.id = u.user_id
         left join sys_dept d on u.dept_id = d.dept_id