Skip to content

D
dd_school
Commit e8322aed by xuwenhao
Options

11.30修改测试问题

parent 7236696d
Showing with 466 additions and 88 deletions
core-common/src/main/java/com/core/constant/ProcessVariables.java
......@@ -26,6 +26,11 @@ public class ProcessVariables {
public static final String DEPARTMENTUSERID = "departmentUserId";
/**
* 采购申请人
*/
public static final String PURCHASEAPPLYUSERID = "purchaseApplyUserId";
/**
* 教师请假级部/处室主任
* */
public static final String HANDUSERID1 = "handUserId1";
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/curricula/CurriCulaVariableController.java
......@@ -41,22 +41,22 @@ public class CurriCulaVariableController extends BaseController {
/**
* 新增选课任务
* @param curriculaVariable
* @param curriculaVariableVo
* @return
*/
@PostMapping("/add")
public AjaxResult add(@RequestBody CurriculaVariable curriculaVariable){
return toAjax(curriculaVariableService.insertCurriculaVariable(curriculaVariable));
public AjaxResult add(@RequestBody CurriculaVariableVo curriculaVariableVo){
return toAjax(curriculaVariableService.insertCurriculaVariable(curriculaVariableVo));
}
/**
* 修改选课任务
* @param curriculaVariable
* @param curriculaVariableVo
* @return
*/
@PostMapping("/edit")
public AjaxResult edit(@RequestBody CurriculaVariable curriculaVariable){
return toAjax(curriculaVariableService.updateCurriculaVariable(curriculaVariable));
public AjaxResult edit(@RequestBody CurriculaVariableVo curriculaVariableVo){
return toAjax(curriculaVariableService.updateCurriculaVariable(curriculaVariableVo));
}
/**
......@@ -86,4 +86,13 @@ public class CurriCulaVariableController extends BaseController {
public AjaxResult getGrade(){
return AjaxResult.success(curriculaVariableService.getGrade());
}
}
\ No newline at end of file
/**
* 获取春季，夏季，艺体科目
*/
@GetMapping("/selectXkTypeList")
public AjaxResult selectXkTypeList(){
return AjaxResult.success(curriculaVariableService.selectXkTypeList());
}
}
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/purchase/SchoolPurchaseController.java
......@@ -129,8 +129,8 @@ public class SchoolPurchaseController extends BaseController {
for(SchoolPurchaseDetails details : list){
SchoolPurchaseDetailsVo dv = new SchoolPurchaseDetailsVo();
BeanUtils.copyProperties(details,dv);
SchoolAssetsType type = typeService.getById(details.getAssetsType());
dv.setAssetsTypeName(type.getTypeName());
// SchoolAssetsType type = typeService.getById(details.getAssetsType());
// dv.setAssetsTypeName(type.getTypeName());
voList.add(dv);
}
vo.setList(voList);
......@@ -240,6 +240,8 @@ public class SchoolPurchaseController extends BaseController {
schoolPurchase.setState(PASS);
} else {
schoolPurchase.setState(REFUSE);
schoolPurchase.setTjzt("0");
schoolPurchase.setInstanceId(null);
}
/** 修改任务结果 */
schoolPurchaseService.updateById(schoolPurchase);
......@@ -270,7 +272,6 @@ public class SchoolPurchaseController extends BaseController {
// wxApiService.sendLeaveResultTemplate(template);
return AjaxResult.success("审批完成");
}
//转换时间
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
Date time = schoolPurchase.getApplyTime();
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/teacher/SchoolTeacherLeaveController.java
......@@ -130,6 +130,18 @@ public class SchoolTeacherLeaveController extends BaseController {
}
/**
* 导出教职工请假信息汇总
* @param response
* @param schoolTeacherLeave
*/
@PostMapping("/exportTeacherLeaveList")
public void exportTeacherLeaveList(HttpServletResponse response, SchoolTeacherLeave schoolTeacherLeave){
List<TeacherLeaveVO> list = schoolTeacherLeaveService.getList(schoolTeacherLeave);
ExcelUtil<TeacherLeaveVO> util = new ExcelUtil<TeacherLeaveVO>(TeacherLeaveVO.class);
util.exportExcel(response, list, "教职工请假信息汇总表");
}
/**
* 查询详情
*
* @param id
......
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/curricula/CurriculaSub.java 0 → 100644
package yangtz.cs.liu.campus.domain.curricula;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.util.Date;
/**
* 选课和科目关联对象
*/
@Data
public class CurriculaSub {
/** 主键id */
private Long id;
/** 选课主键id */
private Long curriculaId;
/** 科目类型 */
private String dictType;
/** 科目名称 */
private String dictLabel;
/** 科目键值 */
private String dictValue;
/** 排序 */
private Integer dictSort;
/** 创建人 */
private String createBy;
/** 创建时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
}
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/curricula/SchoolDivisionStudent.java
......@@ -17,6 +17,9 @@ public class SchoolDivisionStudent {
/** 学生主键id */
private Long studentId;
/** 分班次数 */
private String fbcs;
/** 删除状态 */
private String delFlag;
}
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/purchase/SchoolPurchase.java
......@@ -48,6 +48,11 @@ public class SchoolPurchase extends OurBaseEntity {
private BigDecimal purchaseMoney;
/**
* 实际采购金额
*/
private BigDecimal sjPurchaseMoney;
/**
* 采购说明
*/
private String remark;
......@@ -97,4 +102,9 @@ public class SchoolPurchase extends OurBaseEntity {
* 状态
*/
private String state;
/**
* 提交状态（1已提交，0未提交）
*/
private String tjzt;
}
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/purchase/SchoolPurchaseDetails.java
......@@ -17,7 +17,7 @@ public class SchoolPurchaseDetails extends OurBaseEntity {
/**
* 资产分类
*/
private Long assetsType;
private String assetsTypeName;
/**
* 资产名称
......
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolDepartmentBudget/SchoolDepartmentBudgetProjectmx.java
......@@ -47,10 +47,14 @@ public class SchoolDepartmentBudgetProjectmx extends BaseEntity
@Excel(name = "项目明细")
private String projectExpenditures;
/** 申请总额（万元） */
@Excel(name = "申请总额（万元）")
/** 申请总额 */
@Excel(name = "申请总额")
private BigDecimal applyMoney;
/** 单位 */
@Excel(name = "单位")
private String unit;
/** 是否政府采购（1-是，0-否） */
@Excel(name = "是否政府采购")
private String isGovernmentPurchase;
......@@ -71,6 +75,14 @@ public class SchoolDepartmentBudgetProjectmx extends BaseEntity
/** 分管领导名称 */
private String leadershipName;
public String getUnit() {
return unit;
}
public void setUnit(String unit) {
this.unit = unit;
}
public Long getInformantId() {
return informantId;
}
......@@ -211,6 +223,7 @@ public class SchoolDepartmentBudgetProjectmx extends BaseEntity
.append("projectExpenditures", getProjectExpenditures())
.append("isGovernmentPurchase", getIsGovernmentPurchase())
.append("applyMoney", getApplyMoney())
.append("unit", getUnit())
.append("remark", getRemark())
.toString();
}
......
smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/curricula/CurriculaVariableMapper.java
package yangtz.cs.liu.campus.mapper.curricula;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.common.core.domain.entity.SysDictType;
import org.apache.ibatis.annotations.Param;
import yangtz.cs.liu.campus.domain.curricula.CurriculaSub;
import yangtz.cs.liu.campus.domain.curricula.CurriculaVariable;
import yangtz.cs.liu.campus.vo.curricula.CurriculaVariableVo;
import java.util.List;
import java.util.Map;
......@@ -11,10 +14,10 @@ public interface CurriculaVariableMapper extends BaseMapper<CurriculaVariable>
{
/**
* 新增选课任务
* @param curriculaVariable
* @param curriculaVariableVo
* @return
*/
int insertCurriculaVariable(CurriculaVariable curriculaVariable);
int insertCurriculaVariable(CurriculaVariableVo curriculaVariableVo);
/**
* 通过级部查询学生id集合
......@@ -35,4 +38,36 @@ public interface CurriculaVariableMapper extends BaseMapper<CurriculaVariable>
* @return
*/
List<Map<String, String>> getGrade(@Param("teacherId") Long teacherId);
/**
* 获取春季，夏季，艺体科目
* @return
*/
List<SysDictType> selectXkTypeList();
/**
* 查询选课与科目关系列表
* @return
*/
List<CurriculaSub> selectCurriculaSubList(CurriculaSub curriculaSub);
/**
* 删除选课与科目关系
* @param curriculaId
* @return
*/
int deleteCurriculaSubByCurriculaId(@Param("curriculaId") Long curriculaId);
/**
* 批量删除选课与科目关系
* @param ids
* @return
*/
int deleteCurriculaSubByCurriculaIds(Long[] ids);
/**
* 批量新增选课与科目关系
* @param cjkmList1
*/
void batchInsetCurriculaSubs(List<CurriculaSub> cjkmList1);
}
smart-campus/src/main/java/yangtz/cs/liu/campus/service/curricula/ICurriculaVariableService.java
package yangtz.cs.liu.campus.service.curricula;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.domain.entity.SysDictType;
import yangtz.cs.liu.campus.domain.curricula.CurriculaVariable;
import yangtz.cs.liu.campus.vo.curricula.CurriculaVariableVo;
......@@ -17,10 +18,10 @@ public interface ICurriculaVariableService extends IService<CurriculaVariable> {
/**
* 新增选课任务
* @param curriculaVariable
* @param curriculaVariableVo
* @return
*/
int insertCurriculaVariable(CurriculaVariable curriculaVariable);
int insertCurriculaVariable(CurriculaVariableVo curriculaVariableVo);
/**
* 获取选课任务详细信息
......@@ -44,14 +45,21 @@ public interface ICurriculaVariableService extends IService<CurriculaVariable> {
/**
* 修改选课任务
* @param curriculaVariable
* @param curriculaVariableVo
* @return
*/
int updateCurriculaVariable(CurriculaVariable curriculaVariable);
int updateCurriculaVariable(CurriculaVariableVo curriculaVariableVo);
/**
* 获取选课任务下拉框
* @return
*/
List<Map<String,String>> getGrade();
/**
* 获取春季，夏季，艺体科目
* @return
*/
List<SysDictType> selectXkTypeList();
}
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/curricula/CurriculaVariableServiceImpl.java
......@@ -2,14 +2,17 @@ package yangtz.cs.liu.campus.service.impl.curricula;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.domain.entity.SysDictType;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import yangtz.cs.liu.campus.domain.curricula.CurriculaStudent;
import yangtz.cs.liu.campus.domain.curricula.CurriculaSub;
import yangtz.cs.liu.campus.domain.curricula.CurriculaVariable;
import yangtz.cs.liu.campus.domain.schoolgrade.SchoolGrade;
import yangtz.cs.liu.campus.mapper.curricula.CurriculaStudentMapper;
......@@ -63,27 +66,27 @@ public class CurriculaVariableServiceImpl extends ServiceImpl<CurriculaVariableM
/**
* 新增选课任务
* @param curriculaVariable
* @param curriculaVariableVo
* @return
*/
@Override
@Transactional
public int insertCurriculaVariable(CurriculaVariable curriculaVariable) {
public int insertCurriculaVariable(CurriculaVariableVo curriculaVariableVo) {
int i = 0;
//判断是否已存在当前级部选课任务
LambdaQueryWrapper<CurriculaVariable> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(CurriculaVariable::getGrade,curriculaVariable.getGrade())
wrapper.eq(CurriculaVariable::getGrade,curriculaVariableVo.getGrade())
.eq(CurriculaVariable::getDelFlag,"0");
List<CurriculaVariable> curriculaVariables = curriculaVariableMapper.selectList(wrapper);
if (curriculaVariables.size() > 0){
throw new ServiceException("已存在当前级部的选课任务");
}
curriculaVariable.setCreateBy(SecurityUtils.getLoginUser().getUser().getUserName());
curriculaVariable.setCreateTime(DateUtils.getNowDate());
curriculaVariableVo.setCreateBy(SecurityUtils.getLoginUser().getUser().getUserName());
curriculaVariableVo.setCreateTime(DateUtils.getNowDate());
//新增选课任务
i += curriculaVariableMapper.insertCurriculaVariable(curriculaVariable);
i += curriculaVariableMapper.insertCurriculaVariable(curriculaVariableVo);
//通过id查询刚新增的选课任务
CurriculaVariable variable = curriculaVariableMapper.selectById(curriculaVariable.getId());
CurriculaVariable variable = curriculaVariableMapper.selectById(curriculaVariableVo.getId());
//新增学生与选课任务关系
List<Long> studentIds = curriculaVariableMapper.selectByGrade(variable.getGrade());
......@@ -92,11 +95,13 @@ public class CurriculaVariableServiceImpl extends ServiceImpl<CurriculaVariableM
for (Long studentId : studentIds) {
CurriculaStudent curriculaStudent = new CurriculaStudent();
curriculaStudent.setStudentId(studentId);
curriculaStudent.setCurriculaId(curriculaVariable.getId());
curriculaStudent.setCurriculaId(curriculaVariableVo.getId());
curriculaStudents.add(curriculaStudent);
}
curriculaStudentMapper.batchInsertCurriculaStudent(curriculaStudents);
}
//新增选课与科目关系
insertCurriculaSub(curriculaVariableVo);
return i;
}
......@@ -118,6 +123,28 @@ public class CurriculaVariableServiceImpl extends ServiceImpl<CurriculaVariableM
Long yxrs = map.get("yxrs");
curriculaVariableVo.setYxrs(zrs.intValue());
curriculaVariableVo.setZrs(yxrs.intValue());
//查询选课与科目关系
CurriculaSub cj = new CurriculaSub();
cj.setCurriculaId(id);
cj.setDictType("specialty");
List<CurriculaSub> cjs = curriculaVariableMapper.selectCurriculaSubList(cj);
if (cjs.size() > 0){
curriculaVariableVo.setCjkmList(cjs);
}
CurriculaSub xj = new CurriculaSub();
xj.setCurriculaId(id);
xj.setDictType("summer_course");
List<CurriculaSub> xjs = curriculaVariableMapper.selectCurriculaSubList(xj);
if (xjs.size() > 0){
curriculaVariableVo.setXjkmList(xjs);
}
CurriculaSub yt = new CurriculaSub();
yt.setCurriculaId(id);
yt.setDictType("art_subject");
List<CurriculaSub> yts = curriculaVariableMapper.selectCurriculaSubList(yt);
if (yts.size() > 0){
curriculaVariableVo.setYtkmList(yts);
}
return curriculaVariableVo;
}
......@@ -148,23 +175,72 @@ public class CurriculaVariableServiceImpl extends ServiceImpl<CurriculaVariableM
/**
* 修改选课任务
* @param curriculaVariable
* @param curriculaVariableVo
* @return
*/
@Override
public int updateCurriculaVariable(CurriculaVariable curriculaVariable) {
public int updateCurriculaVariable(CurriculaVariableVo curriculaVariableVo) {
LambdaQueryWrapper<CurriculaVariable> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(CurriculaVariable::getGrade,curriculaVariable.getGrade())
.ne(CurriculaVariable::getId,curriculaVariable.getId())
wrapper.eq(CurriculaVariable::getGrade,curriculaVariableVo.getGrade())
.ne(CurriculaVariable::getId,curriculaVariableVo.getId())
.eq(CurriculaVariable::getDelFlag,'0');
List<CurriculaVariable> curriculaVariables = curriculaVariableMapper.selectList(wrapper);
if (curriculaVariables.size() > 0){
throw new ServiceException("已存在当前级部");
}
CurriculaVariable curriculaVariable = new CurriculaVariable();
BeanUtils.copyProperties(curriculaVariableVo,curriculaVariable);
//删除选课与科目关联
curriculaVariableMapper.deleteCurriculaSubByCurriculaId(curriculaVariableVo.getId());
//新增选课与科目关联
insertCurriculaSub(curriculaVariableVo);
return curriculaVariableMapper.updateById(curriculaVariable);
}
/**
* 新增选课与科目关联
* @param curriculaVariableVo
*/
public void insertCurriculaSub(CurriculaVariableVo curriculaVariableVo){
List<CurriculaSub> cjkmList = curriculaVariableVo.getCjkmList();
List<CurriculaSub> xjkmList = curriculaVariableVo.getXjkmList();
List<CurriculaSub> ytkmList = curriculaVariableVo.getYtkmList();
if (cjkmList.size() > 0){
List<CurriculaSub> cjkmList1 = new ArrayList<>();
for (CurriculaSub cjkm : cjkmList) {
cjkm.setCurriculaId(curriculaVariableVo.getId());
cjkm.setCreateBy(SecurityUtils.getUsername());
cjkm.setCreateTime(DateUtils.getNowDate());
cjkmList1.add(cjkm);
}
//批量新增春季选课科目
curriculaVariableMapper.batchInsetCurriculaSubs(cjkmList1);
}
if (xjkmList.size() > 0){
List<CurriculaSub> xjkmList1 = new ArrayList<>();
for (CurriculaSub xjkm : xjkmList) {
xjkm.setCurriculaId(curriculaVariableVo.getId());
xjkm.setCreateBy(SecurityUtils.getUsername());
xjkm.setCreateTime(DateUtils.getNowDate());
xjkmList1.add(xjkm);
}
//批量新增春季选课科目
curriculaVariableMapper.batchInsetCurriculaSubs(xjkmList1);
}
if (ytkmList.size() > 0){
List<CurriculaSub> ytkmList1 = new ArrayList<>();
for (CurriculaSub ytkm : ytkmList) {
ytkm.setCurriculaId(curriculaVariableVo.getId());
ytkm.setCreateBy(SecurityUtils.getUsername());
ytkm.setCreateTime(DateUtils.getNowDate());
ytkmList1.add(ytkm);
}
//批量新增春季选课科目
curriculaVariableMapper.batchInsetCurriculaSubs(ytkmList1);
}
}
/**
* 获取选课任务下拉框
* @return
*/
......@@ -173,4 +249,13 @@ public class CurriculaVariableServiceImpl extends ServiceImpl<CurriculaVariableM
Long teacherId = SecurityUtils.getLoginUser().getUser().getUserId();
return curriculaVariableMapper.getGrade(teacherId);
}
/**
* 获取春季，夏季，艺体科目
* @return
*/
@Override
public List<SysDictType> selectXkTypeList() {
return curriculaVariableMapper.selectXkTypeList();
}
}
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/curricula/DivisionClassesServiceImpl.java
......@@ -178,6 +178,7 @@ public class DivisionClassesServiceImpl extends ServiceImpl<DivisionClassesMappe
schoolDivisionStudent.setDivisionClassesId(divisionClasses.get(list1.get(i)).getId());
CurriculaStudentVo curriculaStudentVo1 = curriculaStudentVos.get(i);
schoolDivisionStudent.setStudentId(curriculaStudentVo1.getStudentId());
schoolDivisionStudent.setFbcs("1");
divisionStudentMapper.insert(schoolDivisionStudent);
studentVoList.add(curriculaStudentVo1);
}
......@@ -208,6 +209,7 @@ public class DivisionClassesServiceImpl extends ServiceImpl<DivisionClassesMappe
schoolDivisionStudent.setDivisionClassesId(divisionClasses.get(i).getId());
CurriculaStudentVo curriculaStudentVo1 = curriculaStudentVos.get(people.get(j));
schoolDivisionStudent.setStudentId(curriculaStudentVo1.getStudentId());
schoolDivisionStudent.setFbcs("1");
divisionStudentMapper.insert(schoolDivisionStudent);
}
}
......@@ -223,6 +225,7 @@ public class DivisionClassesServiceImpl extends ServiceImpl<DivisionClassesMappe
//分班班级id
Long id = schoolDivisionClasses1.getId();
schoolDivisionStudent.setDivisionClassesId(id);
schoolDivisionStudent.setFbcs("1");
List<CurriculaStudentVo> studentVoList = new ArrayList<>();
......@@ -426,6 +429,7 @@ public class DivisionClassesServiceImpl extends ServiceImpl<DivisionClassesMappe
schoolDivisionStudent.setDivisionClassesId(divisionClasses.get(list1.get(i)).getId());
CurriculaStudentVo curriculaStudentVo1 = curriculaStudentVos.get(i);
schoolDivisionStudent.setStudentId(curriculaStudentVo1.getStudentId());
schoolDivisionStudent.setFbcs("2");
divisionStudentMapper.insert(schoolDivisionStudent);
studentVoList.add(curriculaStudentVo1);
}
......@@ -456,6 +460,7 @@ public class DivisionClassesServiceImpl extends ServiceImpl<DivisionClassesMappe
schoolDivisionStudent.setDivisionClassesId(divisionClasses.get(i).getId());
CurriculaStudentVo curriculaStudentVo1 = curriculaStudentVos.get(people.get(j));
schoolDivisionStudent.setStudentId(curriculaStudentVo1.getStudentId());
schoolDivisionStudent.setFbcs("2");
divisionStudentMapper.insert(schoolDivisionStudent);
}
}
......@@ -471,6 +476,7 @@ public class DivisionClassesServiceImpl extends ServiceImpl<DivisionClassesMappe
//分班班级id
Long id = schoolDivisionClasses1.getId();
schoolDivisionStudent.setDivisionClassesId(id);
schoolDivisionStudent.setFbcs("2");
List<CurriculaStudentVo> studentVoList = new ArrayList<>();
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/purchase/SchoolPurchaseServiceImpl.java
......@@ -2,6 +2,7 @@ package yangtz.cs.liu.campus.service.impl.purchase;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import org.activiti.engine.HistoryService;
import org.activiti.engine.IdentityService;
......@@ -35,8 +36,9 @@ import static com.baomidou.mybatisplus.core.toolkit.ObjectUtils.isNull;
import static com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotBlank;
import static com.core.constant.ProcessCommon.PENDING;
import static com.core.constant.ProcessCommon.SUSPENDSTATE_PENDING;
import static com.core.constant.ProcessVariables.HANDUSERID1;
import static com.core.constant.ProcessVariables.HANDUSERID2;
import static com.core.constant.ProcessDefinition.DEPARTMENTBUDGET;
import static com.core.constant.ProcessDefinition.PURCHASEREQUEST;
import static com.core.constant.ProcessVariables.*;
import static com.ruoyi.common.utils.SecurityUtils.getUserId;
import static com.ruoyi.common.utils.SecurityUtils.getUsername;
import static com.ruoyi.common.utils.StringUtils.isNotNull;
......@@ -44,10 +46,7 @@ import static com.ruoyi.common.utils.StringUtils.substring;
import static yangtz.cs.liu.campus.constant.ProcessState.APPROVAL;
import static yangtz.cs.liu.campus.constant.ProcessState.SAVE;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;
/**
......@@ -95,7 +94,7 @@ public class SchoolPurchaseServiceImpl extends ServiceImpl<SchoolPurchaseMapper,
//增子表
for(SchoolPurchaseDetailsVo details : purchase.getList()){
//子表各数据为空时或为""时不可新增空数据
if(details.getAssetsType().equals("") && details.getAssetsName().equals("")
if(details.getAssetsTypeName().equals("") && details.getAssetsName().equals("")
&& details.getAssetsSpecs().equals("") && isNull(details.getAssetsNumbers())
&& details.getAssetsUnit().equals("") && isNull(details.getAssetsPrice())
&& isNull(details.getTotalPrice()) && details.getRemark().equals("")){
......@@ -130,7 +129,7 @@ public class SchoolPurchaseServiceImpl extends ServiceImpl<SchoolPurchaseMapper,
//增子表
for(SchoolPurchaseDetailsVo details : purchase.getList()){
//子表各数据为空时或为""时不可新增空数据
if(details.getAssetsType().equals("") && details.getAssetsName().equals("")
if(details.getAssetsTypeName().equals("") && details.getAssetsName().equals("")
&& details.getAssetsSpecs().equals("") && isNull(details.getAssetsNumbers())
&& details.getAssetsUnit().equals("") && isNull(details.getAssetsPrice())
&& isNull(details.getTotalPrice()) && details.getRemark().equals("")){
......@@ -227,6 +226,8 @@ public class SchoolPurchaseServiceImpl extends ServiceImpl<SchoolPurchaseMapper,
String businessKey = schoolPurchase.getId().toString();
identityService.setAuthenticatedUserId(username);
//采购申请人
variables.put(PURCHASEAPPLYUSERID,schoolPurchase.getApplyId());
//处室领导
variables.put(HANDUSERID1,schoolPurchase.getHandUserId1());
//财务领导
......@@ -239,7 +240,33 @@ public class SchoolPurchaseServiceImpl extends ServiceImpl<SchoolPurchaseMapper,
schoolPurchase.setInstanceId(instanceId);
//审批中
schoolPurchase.setState(APPROVAL);
return schoolPurchaseMapper.updateById(schoolPurchase);
schoolPurchase.setTjzt("1");
int i = schoolPurchaseMapper.updateById(schoolPurchase);
SchoolPurchase purchase = schoolPurchaseMapper.selectById(schoolPurchase.getId());
//转vo
SchoolPurchaseVo schoolPurchaseVo = new SchoolPurchaseVo();
BeanUtils.copyProperties(purchase,schoolPurchaseVo);
//当前登录人待办任务集合
String userId = SecurityUtils.getLoginUser().getUser().getUserId().toString();
List<Task> taskList = processService.findAssigneeTasks(userId, PURCHASEREQUEST);
for (Task task : taskList) {
TaskEntityImpl taskImpl = (TaskEntityImpl) task;
//拿到当前任务id
String processInstanceId = taskImpl.getProcessInstanceId();
//拿到流程定义对象
ProcessInstance processInstance1 = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
//业务id(我们当时新增的时候指定了businessKey为id)
String businessKey1 = processInstance1.getBusinessKey();
if (businessKey1.equals(businessKey)){
schoolPurchaseVo.setTaskId(taskImpl.getId());
}
}
String taskId = schoolPurchaseVo.getTaskId();
Map<String,Object> variables1 = new HashMap<>();
variables1.put("comment","同意");
variables1.put("pass","true");
processService.completeTask(taskId, instanceId, variables1);
return i;
}
/**
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolEquipment/EquipmentLedgerServiceImpl.java
......@@ -21,10 +21,8 @@ import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolEquipmentLedgerVo;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;
@Service
public class EquipmentLedgerServiceImpl extends ServiceImpl<EquipmentLedgerMapper, SchoolEquipmentLedger> implements IEquipmentLedgerService {
......@@ -121,8 +119,23 @@ public class EquipmentLedgerServiceImpl extends ServiceImpl<EquipmentLedgerMappe
@Transactional
public int insertSchoolEquipmentLedger(SchoolEquipmentLedger schoolEquipmentLedger) {
if (StringUtils.isNotNull(schoolEquipmentLedger.getUseId())){
String userName = sysUserMapper.selectUserById(schoolEquipmentLedger.getUseId()).getUserName();
schoolEquipmentLedger.setUseName(userName);
if (schoolEquipmentLedger.getUseId() == -1L){
schoolEquipmentLedger.setUseName("物理实验室");
}else if (schoolEquipmentLedger.getUseId() == -2L){
schoolEquipmentLedger.setUseName("化学实验室");
}else if (schoolEquipmentLedger.getUseId() == -3L){
schoolEquipmentLedger.setUseName("生物实验室");
}else if (schoolEquipmentLedger.getUseId() == -4L){
schoolEquipmentLedger.setUseName("技术部门");
}else if (schoolEquipmentLedger.getUseId() == -5L){
schoolEquipmentLedger.setUseName("艺术");
}else if (schoolEquipmentLedger.getUseId() == -6L){
schoolEquipmentLedger.setUseName("级部");
}else {
String userName = sysUserMapper.selectUserById(schoolEquipmentLedger.getUseId()).getUserName();
schoolEquipmentLedger.setUseName(userName);
}
}
if (schoolEquipmentLedger.getClassificationCode().length() < 4){
throw new ServiceException("分类编码至少选择至二级分类！");
......@@ -151,8 +164,22 @@ public class EquipmentLedgerServiceImpl extends ServiceImpl<EquipmentLedgerMappe
@Transactional
public int updateSchoolEquipmentLedger(SchoolEquipmentLedger schoolEquipmentLedger) {
if (StringUtils.isNotNull(schoolEquipmentLedger.getUseId())){
String userName = sysUserMapper.selectUserById(schoolEquipmentLedger.getUseId()).getUserName();
schoolEquipmentLedger.setUseName(userName);
if (schoolEquipmentLedger.getUseId() == -1L){
schoolEquipmentLedger.setUseName("物理实验室");
}else if (schoolEquipmentLedger.getUseId() == -2L){
schoolEquipmentLedger.setUseName("化学实验室");
}else if (schoolEquipmentLedger.getUseId() == -3L){
schoolEquipmentLedger.setUseName("生物实验室");
}else if (schoolEquipmentLedger.getUseId() == -4L){
schoolEquipmentLedger.setUseName("技术部门");
}else if (schoolEquipmentLedger.getUseId() == -5L){
schoolEquipmentLedger.setUseName("艺术");
}else if (schoolEquipmentLedger.getUseId() == -6L){
schoolEquipmentLedger.setUseName("级部");
}else {
String userName = sysUserMapper.selectUserById(schoolEquipmentLedger.getUseId()).getUserName();
schoolEquipmentLedger.setUseName(userName);
}
}
schoolEquipmentLedger.setUpdateBy(SecurityUtils.getLoginUser().getUser().getUserName());
schoolEquipmentLedger.setUpdateTime(DateUtils.getNowDate());
......@@ -291,7 +318,33 @@ public class EquipmentLedgerServiceImpl extends ServiceImpl<EquipmentLedgerMappe
*/
@Override
public List<Map<String, Object>> getUser(SysUser sysUser) {
return equipmentLedgerMapper.getUser(sysUser);
List<Map<String, Object>> userList = new ArrayList<>();
Map<String, Object> map1 = new HashMap<>();
map1.put("userId",-1);
map1.put("userName","物理实验室");
userList.add(map1);
Map<String, Object> map2 = new HashMap<>();
map2.put("userId",-2);
map2.put("userName","化学实验室");
userList.add(map2);
Map<String, Object> map3 = new HashMap<>();
map3.put("userId",-3);
map3.put("userName","生物实验室");
userList.add(map3);
Map<String, Object> map4 = new HashMap<>();
map4.put("userId",-4);
map4.put("userName","技术部门");
userList.add(map4);
Map<String, Object> map5 = new HashMap<>();
map5.put("userId",-5);
map5.put("userName","艺术");
userList.add(map5);
Map<String, Object> map6 = new HashMap<>();
map6.put("userId",-6);
map6.put("userName","级部");
userList.add(map6);
userList.addAll(equipmentLedgerMapper.getUser(sysUser));
return userList;
}
/**
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolbudget/SchoolBudgetServiceImpl.java
......@@ -141,12 +141,14 @@ public class SchoolBudgetServiceImpl extends ServiceImpl<SchoolBudgetMapper, Sch
List<SchoolPurchaseVo> schoolPurchaseVos = schoolPurchaseMapper.selectPurchaseList(schoolPurchase1);
BigDecimal bigDecimal = new BigDecimal("0");
for (SchoolPurchaseVo schoolPurchase : schoolPurchaseVos) {
BigDecimal add = bigDecimal.add(new BigDecimal(schoolPurchase.getPurchaseMoney().toString()));
BigDecimal add = bigDecimal.add(schoolPurchase.getSjPurchaseMoney());
bigDecimal = add;
}
BigDecimal bigDecimal1 = new BigDecimal("10000");
BigDecimal amountSpent = bigDecimal.divide(bigDecimal1);
budget.setAmountSpent(amountSpent);
//计算可用余额(单位为元)
budget.setKyye((budget.getGiveMoney().subtract(amountSpent)).multiply(new BigDecimal("10000")));
}
return budgets;
}
......
smart-campus/src/main/java/yangtz/cs/liu/campus/vo/curricula/CurriculaVariableVo.java
......@@ -2,8 +2,10 @@ package yangtz.cs.liu.campus.vo.curricula;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import yangtz.cs.liu.campus.domain.curricula.CurriculaSub;
import java.util.Date;
import java.util.List;
/**
* 选课对象
......@@ -38,4 +40,13 @@ public class CurriculaVariableVo {
private Integer yxrs;
/** 总人数 */
private Integer zrs;
/** 春季科目集合 */
private List<CurriculaSub> cjkmList;
/** 夏季科目集合 */
private List<CurriculaSub> xjkmList;
/** 艺体科目集合 */
private List<CurriculaSub> ytkmList;
}
smart-campus/src/main/java/yangtz/cs/liu/campus/vo/purchase/PurchaseVo.java
......@@ -55,6 +55,11 @@ public class PurchaseVo extends OurBaseEntity {
private BigDecimal purchaseMoney;
/**
* 实际采购费用
*/
private BigDecimal sjPurchaseMoney;
/**
* 采购说明
*/
private String remark;
......@@ -107,6 +112,11 @@ public class PurchaseVo extends OurBaseEntity {
*/
private String state;
/**
* 提交状态（1已提交，0未提交）
*/
private String tjzt;
/**子表数据*/
List<SchoolPurchaseDetailsVo> list;
}
smart-campus/src/main/java/yangtz/cs/liu/campus/vo/purchase/SchoolPurchaseDetailsVo.java
......@@ -15,7 +15,7 @@ public class SchoolPurchaseDetailsVo extends OurBaseEntity {
/**
* 资产分类
*/
private Long assetsType;
// private Long assetsType;
private String assetsTypeName;
/**
......
smart-campus/src/main/java/yangtz/cs/liu/campus/vo/purchase/SchoolPurchaseVo.java
......@@ -51,6 +51,11 @@ public class SchoolPurchaseVo extends ProcessBaseEntity {
private BigDecimal purchaseMoney;
/**
* 实际采购金额
*/
private BigDecimal sjPurchaseMoney;
/**
* 采购说明
*/
private String remark;
......@@ -100,4 +105,9 @@ public class SchoolPurchaseVo extends ProcessBaseEntity {
* 当前状态
*/
private String state;
/**
* 提交状态（1已提交，0未提交）
*/
private String tjzt;
}
smart-campus/src/main/java/yangtz/cs/liu/campus/vo/schoolbudget/SchoolBudgetVo.java
......@@ -59,6 +59,9 @@ public class SchoolBudgetVo extends OurBaseEntity
@Excel(name = "备注", needMerge = true)
private String remark;
/** 可用余额 */
private BigDecimal kyye;
@Excel(name = "明细")
private List<SchoolBudgetDetails> schoolBudgetDetailsList;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/vo/teacher/TeacherLeaveVO.java
......@@ -20,8 +20,16 @@ public class TeacherLeaveVO extends ProcessBaseEntity {
private String type;
/**
* 老师名称
*/
@Excel(name = "老师名称")
@NotBlank(message = "老师名称不能为空")
private String teacherName;
/**
* 标题
*/
@Excel(name = "请假标题")
private String title;
/**
......@@ -31,16 +39,9 @@ public class TeacherLeaveVO extends ProcessBaseEntity {
private Long teacherId;
/**
* 老师名称
*/
@Excel(name = "老师名称")
@NotBlank(message = "老师名称不能为空")
private String teacherName;
/**
* 请假原因
*/
@Excel(name = "请假原因")
// @Excel(name = "请假原因")
@NotBlank(message = "请假原因不能为空")
private String reasonForLeave;
......@@ -55,7 +56,7 @@ public class TeacherLeaveVO extends ProcessBaseEntity {
/**
* 请假开始节次（1-8）
*/
@Excel(name = "请假开始节次（1-8）")
// @Excel(name = "请假开始节次（1-8）")
private String startSort;
/**
......@@ -69,7 +70,7 @@ public class TeacherLeaveVO extends ProcessBaseEntity {
/**
* 请假结束节次（1-8）
*/
@Excel(name = "请假结束节次（1-8）")
// @Excel(name = "请假结束节次（1-8）")
private String endSort;
/**
......@@ -87,7 +88,7 @@ public class TeacherLeaveVO extends ProcessBaseEntity {
/**
* 流程实例ID
*/
@Excel(name = "流程实例ID")
// @Excel(name = "流程实例ID")
private String instanceId;
/**
......@@ -99,7 +100,7 @@ public class TeacherLeaveVO extends ProcessBaseEntity {
* 申请时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "申请时间", width = 30, dateFormat = "yyyy-MM-dd")
// @Excel(name = "申请时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date applyTime;
/**
......
smart-campus/src/main/java/yangtz/cs/liu/wechat/controller/purchase/WxSchoolPurchaseController.java
......@@ -81,8 +81,8 @@ public class WxSchoolPurchaseController extends BaseController {
for(SchoolPurchaseDetails details : list){
SchoolPurchaseDetailsVo dv = new SchoolPurchaseDetailsVo();
BeanUtils.copyProperties(details,dv);
SchoolAssetsType type = typeService.getById(details.getAssetsType());
dv.setAssetsTypeName(type.getTypeName());
// SchoolAssetsType type = typeService.getById(details.getAssetsType());
// dv.setAssetsTypeName(type.getTypeName());
voList.add(dv);
}
vo.setList(voList);
......@@ -116,8 +116,8 @@ public class WxSchoolPurchaseController extends BaseController {
for(SchoolPurchaseDetails details : list){
SchoolPurchaseDetailsVo dv = new SchoolPurchaseDetailsVo();
BeanUtils.copyProperties(details,dv);
SchoolAssetsType type = typeService.getById(details.getAssetsType());
dv.setAssetsTypeName(type.getTypeName());
// SchoolAssetsType type = typeService.getById(details.getAssetsType());
// dv.setAssetsTypeName(type.getTypeName());
voList.add(dv);
}
purchaseVo.setList(voList);
......
smart-campus/src/main/resources/mapper/auditorium/SchoolAuditoriumMapper.xml
......@@ -48,7 +48,6 @@
<select id="selectSchoolAuditoriumList" parameterType="SchoolAuditoriumVo" resultMap="SchoolAuditoriumResult">
<include refid="selectSchoolAuditoriumVo"/>
<where>
state != '0'
<if test="activityName != null and activityName != ''"> and activity_name like concat('%', #{activityName}, '%')</if>
<if test="activityArea != null and activityArea != ''"> and activity_area = #{activityArea}</if>
<if test="activityTime != null "> and activity_time = #{activityTime}</if>
......
smart-campus/src/main/resources/mapper/curricula/CurriculaStudentMapper.xml
......@@ -109,8 +109,8 @@
curricula_student xk
LEFT JOIN school_student xs ON xk.student_id = xs.id
LEFT JOIN school_class bj ON xs.class_id = bj.id
LEFT JOIN school_division_student ds ON xk.student_id = ds.student_id
LEFT JOIN school_division_classes dc ON ds.division_classes_id = dc.id and dc.division_classes_frequency = '1'
LEFT JOIN school_division_student ds ON xk.student_id = ds.student_id AND ds.fbcs = '1'
LEFT JOIN school_division_classes dc ON ds.division_classes_id = dc.id
WHERE
xk.curricula_id = #{curriculaId} and xk.course_type = '2' and xk.del_flag = '0'
<if test="classId != null">and xs.class_id = #{classId}</if>
......@@ -141,8 +141,8 @@
curricula_student xk
LEFT JOIN school_student xs ON xk.student_id = xs.id
LEFT JOIN school_class bj ON xs.class_id = bj.id
LEFT JOIN school_division_student ds ON xk.student_id = ds.student_id
LEFT JOIN school_division_classes dc ON ds.division_classes_id = dc.id and dc.division_classes_frequency = '2'
LEFT JOIN school_division_student ds ON xk.student_id = ds.student_id AND ds.fbcs = '2'
LEFT JOIN school_division_classes dc ON ds.division_classes_id = dc.id
WHERE
xk.curricula_id = #{curriculaId} and xk.course_type = '2' and xk.del_flag = '0'
<if test="classId != null">and xs.class_id = #{classId}</if>
......
smart-campus/src/main/resources/mapper/curricula/CurriculaVariableMapper.xml
......@@ -16,7 +16,7 @@
<result property="delFlag" column="del_flag" />
</resultMap>
<insert id="insertCurriculaVariable" parameterType="CurriculaVariable" useGeneratedKeys="true" keyProperty="id">
<insert id="insertCurriculaVariable" parameterType="yangtz.cs.liu.campus.vo.curricula.CurriculaVariableVo" useGeneratedKeys="true" keyProperty="id">
insert into curricula_variable
<trim prefix="(" suffix=")" suffixOverrides=",">
id,
......@@ -74,4 +74,40 @@
from curricula_variable cv
where cv.del_flag = '0'
</select>
</mapper>
\ No newline at end of file
<select id="selectXkTypeList" resultType="SysDictType">
select dict_id, dict_name, dict_type, status, create_by, create_time, remark
from sys_dict_type where dict_type in ("specialty","summer_course","art_subject")
</select>
<select id="selectCurriculaSubList" parameterType="CurriculaSub" resultType="CurriculaSub">
select id, curricula_id, dict_type, dict_label, dict_value, dict_sort, create_by, create_time from curricula_sub
<where>
del_flag = '0'
<if test="curriculaId != null">and curricula_id = #{curriculaId}</if>
<if test="dictType != null and dictType != ''">and dict_type = #{dictType}</if>
<if test="dictLabel != null and dictLabel != ''">and dict_label = #{dictLabel}</if>
<if test="dictValue != null and dictValue != ''">and dict_value = #{dictValue}</if>
<if test="dictSort != null">and dict_sort = #{dictSort}</if>
</where>
</select>
<update id="deleteCurriculaSubByCurriculaId" parameterType="Long">
update curricula_sub set del_flag = '1' where curricula_id = #{curriculaId}
</update>
<update id="deleteCurriculaSubByCurriculaIds" parameterType="String">
update curricula_sub set del_flag = '1' where curricula_id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</update>
<insert id="batchInsetCurriculaSubs">
insert into curricula_sub(curricula_id, dict_type, dict_label, dict_value, dict_sort, create_by, create_time)
values
<foreach collection="list" item="item" separator=",">
(#{item.curriculaId}, #{item.dictType}, #{item.dictLabel}, #{item.dictValue}, #{item.dictSort}, #{item.createBy}, #{item.createTime})
</foreach>
</insert>
</mapper>
smart-campus/src/main/resources/mapper/purchase/SchoolPurchaseMapper.xml
......@@ -15,10 +15,10 @@
<if test="entity.applyId != null">and apply_id = #{entity.applyId}
</if>
<if test="submitState == 0">
and instance_id is null
and tjzt = '0'
</if>
<if test="submitState == 1">
and instance_id is not null
and tjzt = '1'
</if>
and del_flag = '0'
</where>
......
smart-campus/src/main/resources/mapper/schoolDepartmentBudget/SchoolDepartmentBudgetMapper.xml
......@@ -40,6 +40,7 @@
<result property="projectExpenditures" column="sub_project_expenditures" />
<result property="isGovernmentPurchase" column="sub_is_government_purchase" />
<result property="applyMoney" column="sub_apply_money" />
<result property="unit" column="sub_unit" />
<result property="remark" column="sub_remark" />
</resultMap>
......@@ -70,7 +71,7 @@
<select id="selectSchoolDepartmentBudgetById" parameterType="Long" resultMap="SchoolDepartmentBudgetSchoolDepartmentBudgetProjectmxResult">
select a.id, a.instance_id, a.year, a.dept_id, a.dept_name, a.informant_id, a.informant, a.leadership_id, a.leadership_name, a.remark, a.tb_time, a.state, a.apply_id, a.apply_name, a.apply_time, a.create_by_id, a.create_by, a.create_time, a.update_by_id, a.update_by, a.update_time,
b.id as sub_id, b.department_budget_id as sub_department_budget_id, b.project_name as sub_project_name, b.content as sub_content, b.project_expenditures as sub_project_expenditures, b.is_government_purchase as sub_is_government_purchase, b.apply_money as sub_apply_money, b.remark as sub_remark
b.id as sub_id, b.department_budget_id as sub_department_budget_id, b.project_name as sub_project_name, b.content as sub_content, b.project_expenditures as sub_project_expenditures, b.is_government_purchase as sub_is_government_purchase, b.apply_money as sub_apply_money, b.unit as sub_unit, b.remark as sub_remark
from school_department_budget a
left join school_department_budget_projectmx b on b.department_budget_id = a.id
where a.id = #{id}
......@@ -160,9 +161,9 @@
</delete>
<insert id="batchSchoolDepartmentBudgetProjectmx">
insert into school_department_budget_projectmx( id, department_budget_id, project_name, content, project_expenditures, is_government_purchase, apply_money, remark) values
insert into school_department_budget_projectmx( id, department_budget_id, project_name, content, project_expenditures, is_government_purchase, apply_money, unit, remark) values
<foreach item="item" index="index" collection="list" separator=",">
( #{item.id}, #{item.departmentBudgetId}, #{item.projectName}, #{item.content}, #{item.projectExpenditures}, #{item.isGovernmentPurchase}, #{item.applyMoney}, #{item.remark})
( #{item.id}, #{item.departmentBudgetId}, #{item.projectName}, #{item.content}, #{item.projectExpenditures}, #{item.isGovernmentPurchase}, #{item.applyMoney}, #{item.unit}, #{item.remark})
</foreach>
</insert>
</mapper>
\ No newline at end of file
</mapper>
smart-campus/src/main/resources/mapper/schoolDepartmentBudget/SchoolDepartmentBudgetProjectmxMapper.xml
......@@ -15,6 +15,7 @@
<result property="projectExpenditures" column="project_expenditures" />
<result property="isGovernmentPurchase" column="is_government_purchase" />
<result property="applyMoney" column="apply_money" />
<result property="unit" column="unit" />
<result property="remark" column="remark" />
<result property="informantId" column="informant_id" />
<result property="informant" column="informant" />
......@@ -23,12 +24,12 @@
</resultMap>
<sql id="selectSchoolDepartmentBudgetProjectmxVo">
select id, department_budget_id, project_name, content, project_expenditures, is_government_purchase, apply_money, remark from school_department_budget_projectmx
select id, department_budget_id, project_name, content, project_expenditures, is_government_purchase, apply_money, unit, remark from school_department_budget_projectmx
</sql>
<select id="selectList" parameterType="SchoolDepartmentBudgetProjectmx" resultMap="SchoolDepartmentBudgetProjectmxResult">
select p.id, d.year, d.dept_id, d.dept_name, p.department_budget_id, p.project_name,
p.content, p.project_expenditures, p.is_government_purchase, p.apply_money, p.remark
p.content, p.project_expenditures, p.is_government_purchase, p.apply_money, p.unit, p.remark
from school_department_budget_projectmx p left join school_department_budget d on p.department_budget_id = d.id
<where>
d.state = '2'
......@@ -41,7 +42,7 @@
<select id="selectSchoolDepartmentBudgetProjectmxById" parameterType="Long" resultMap="SchoolDepartmentBudgetProjectmxResult">
select p.id, d.year, d.dept_id, d.dept_name, p.department_budget_id, p.project_name, p.content, p.project_expenditures,
p.is_government_purchase, p.apply_money, p.remark, d.informant_id, d.informant, d.leadership_id, d.leadership_name
p.is_government_purchase, p.apply_money, p.unit, p.remark, d.informant_id, d.informant, d.leadership_id, d.leadership_name
from school_department_budget_projectmx p left join school_department_budget d on p.department_budget_id = d.id
where p.id = #{id}
</select>
......@@ -68,6 +69,7 @@
<if test="projectExpenditures != null and projectExpenditures != ''">project_expenditures,</if>
<if test="isGovernmentPurchase != null and isGovernmentPurchase != ''">is_government_purchase,</if>
<if test="applyMoney != null">apply_money,</if>
<if test="unit != null">unit,</if>
<if test="remark != null">remark,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
......@@ -78,6 +80,7 @@
<if test="projectExpenditures != null and projectExpenditures != ''">#{projectExpenditures},</if>
<if test="isGovernmentPurchase != null and isGovernmentPurchase != ''">#{isGovernmentPurchase},</if>
<if test="applyMoney != null">#{applyMoney},</if>
<if test="unit != null">#{unit},</if>
<if test="remark != null">#{remark},</if>
</trim>
</insert>
......@@ -91,6 +94,7 @@
<if test="projectExpenditures != null and projectExpenditures != ''">project_expenditures = #{projectExpenditures},</if>
<if test="isGovernmentPurchase != null and isGovernmentPurchase != ''">is_government_purchase = #{isGovernmentPurchase},</if>
<if test="applyMoney != null">apply_money = #{applyMoney},</if>
<if test="unit != null">unit = #{unit},</if>
<if test="remark != null">remark = #{remark},</if>
</trim>
where id = #{id}
......@@ -106,4 +110,4 @@
#{id}
</foreach>
</delete>
</mapper>
\ No newline at end of file
</mapper>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment