Skip to content

G
gdtel-gztel-school-center
Commit db75326b by 彭祥礼
Options

部分代码去重合并

parent a61eb928
Showing with 33 additions and 130 deletions
service-manager/src/main/java/com/winsun/controller/LzKpiController.java
...@@ -171,34 +171,6 @@ public class LzKpiController extends BaseController { ...@@ -171,34 +171,6 @@ public class LzKpiController extends BaseController {
/** /**
* *
* @param substName
* @return
*/
@Permission(menuname = "初始县分", value = "initSubstName", method = RequestMethod.POST)
public ResponseData<List<School>> initSubstName(@RequestParam(name = "substName", required = false) String substName){
Wrapper<School> schoolWrapper = new EntityWrapper<>();
schoolWrapper.groupBy("sub_name");
List<School> list = schoolMapper.selectList(schoolWrapper);
return ResponseData.success(list);
}
/**
*
* @param substName
* @return
*/
@Permission(menuname = "初始县分", value = "getSchoolNames", method = RequestMethod.POST)
public ResponseData<List<School>> getSchoolNames(@RequestParam(name = "substName", required = false) String substName){
Wrapper<School> schoolWrapper = new EntityWrapper<>();
schoolWrapper.eq(StringUtils.isNotBlank(substName),"sub_name",substName);
schoolWrapper.groupBy("school_name");
List<School> list = schoolMapper.selectList(schoolWrapper);
return ResponseData.success(list);
}
/**
*
* @param userName * @param userName
* @param substName * @param substName
* @param schoolName * @param schoolName
......
service-manager/src/main/java/com/winsun/controller/LzSalaryController.java
...@@ -279,34 +279,6 @@ public class LzSalaryController extends BaseController { ...@@ -279,34 +279,6 @@ public class LzSalaryController extends BaseController {
/** /**
* *
* @param substName
* @return
*/
@Permission(menuname = "初始县分", value = "initSubstName", method = RequestMethod.POST)
public ResponseData<List<School>> initSubstName(@RequestParam(name = "substName", required = false) String substName){
Wrapper<School> schoolWrapper = new EntityWrapper<>();
schoolWrapper.groupBy("sub_name");
List<School> list = schoolMapper.selectList(schoolWrapper);
return ResponseData.success(list);
}
/**
*
* @param substName
* @return
*/
@Permission(menuname = "初始县分", value = "getSchoolNames", method = RequestMethod.POST)
public ResponseData<List<School>> getSchoolNames(@RequestParam(name = "substName", required = false) String substName){
Wrapper<School> schoolWrapper = new EntityWrapper<>();
schoolWrapper.eq(StringUtils.isNotBlank(substName),"sub_name",substName);
schoolWrapper.groupBy("school_name");
List<School> list = schoolMapper.selectList(schoolWrapper);
return ResponseData.success(list);
}
/**
*
* @param userName * @param userName
* @param substName * @param substName
* @param schoolName * @param schoolName
......
service-manager/src/main/java/com/winsun/controller/SaleCensusController.java
...@@ -10,7 +10,6 @@ import com.winsun.auth.core.common.model.ResponseData; ...@@ -10,7 +10,6 @@ import com.winsun.auth.core.common.model.ResponseData;
import com.winsun.auth.core.util.IOUtils; import com.winsun.auth.core.util.IOUtils;
import com.winsun.bean.HhrUser; import com.winsun.bean.HhrUser;
import com.winsun.bean.SalesOrder; import com.winsun.bean.SalesOrder;
import com.winsun.bean.School;
import com.winsun.bean.SysUser; import com.winsun.bean.SysUser;
import com.winsun.mapper.HhrUserMapper; import com.winsun.mapper.HhrUserMapper;
import com.winsun.mapper.SalesOrderMapper; import com.winsun.mapper.SalesOrderMapper;
...@@ -317,32 +316,4 @@ public class SaleCensusController extends BaseController{ ...@@ -317,32 +316,4 @@ public class SaleCensusController extends BaseController{
IOUtils.closeQuite(workbook, os); IOUtils.closeQuite(workbook, os);
} }
} }
/**
*
* @param substName
* @return
*/
@Permission(menuname = "初始县分", value = "initSubstName", method = RequestMethod.POST)
public ResponseData<List<School>> initSubstName(@RequestParam(name = "substName", required = false) String substName){
Wrapper<School> schoolWrapper = new EntityWrapper<>();
schoolWrapper.groupBy("sub_name");
List<School> list = schoolMapper.selectList(schoolWrapper);
return ResponseData.success(list);
}
/**
*
* @param substName
* @return
*/
@Permission(menuname = "初始学校", value = "getSchoolNames", method = RequestMethod.POST)
public ResponseData<List<School>> getSchoolNames(@RequestParam(name = "substName", required = false) String substName){
Wrapper<School> schoolWrapper = new EntityWrapper<>();
schoolWrapper.eq(StringUtils.isNotBlank(substName),"sub_name",substName);
schoolWrapper.groupBy("school_name");
List<School> list = schoolMapper.selectList(schoolWrapper);
return ResponseData.success(list);
}
} }
service-manager/src/main/java/com/winsun/controller/SalesOrderController.java
...@@ -943,18 +943,4 @@ public class SalesOrderController extends BaseController{ ...@@ -943,18 +943,4 @@ public class SalesOrderController extends BaseController{
return sdf.format(new Date(Long.valueOf(seconds+"000"))); return sdf.format(new Date(Long.valueOf(seconds+"000")));
} }
/**
*
* @param substName
* @return
*/
@Permission(menuname = "初始县分", value = "initSubstName", method = RequestMethod.POST)
public ResponseData<List<School>> initSubstName(@RequestParam(name = "substName", required = false) String substName){
Wrapper<School> schoolWrapper = new EntityWrapper<>();
schoolWrapper.groupBy("sub_name");
List<School> list = schoolMapper.selectList(schoolWrapper);
return ResponseData.success(list);
}
} }
service-manager/src/main/java/com/winsun/controller/YsmUserController.java
...@@ -9,9 +9,9 @@ import com.winsun.auth.core.annotion.Permission; ...@@ -9,9 +9,9 @@ import com.winsun.auth.core.annotion.Permission;
import com.winsun.auth.core.base.controller.BaseController; import com.winsun.auth.core.base.controller.BaseController;
import com.winsun.auth.core.common.model.ResponseData; import com.winsun.auth.core.common.model.ResponseData;
import com.winsun.auth.core.shiro.ShiroUser; import com.winsun.auth.core.shiro.ShiroUser;
import com.winsun.bean.UniversityInfo; import com.winsun.bean.School;
import com.winsun.bean.YsmUser; import com.winsun.bean.YsmUser;
import com.winsun.mapper.UniversityInfoMapper; import com.winsun.mapper.SchoolMapper;
import com.winsun.mapper.YsmUserMapper; import com.winsun.mapper.YsmUserMapper;
import com.winsun.utils.MyBatisPlusUpdateUtils; import com.winsun.utils.MyBatisPlusUpdateUtils;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
...@@ -19,8 +19,6 @@ import org.apache.commons.lang3.StringUtils; ...@@ -19,8 +19,6 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.sql.Timestamp;
import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -36,10 +34,11 @@ import java.util.Map; ...@@ -36,10 +34,11 @@ import java.util.Map;
public class YsmUserController extends BaseController { public class YsmUserController extends BaseController {
private static YsmUserMapper ysmUserMapper; private static YsmUserMapper ysmUserMapper;
private static SchoolMapper schoolMapper;
@Autowired @Autowired
public YsmUserController(YsmUserMapper ysmUserMapper) { public YsmUserController(YsmUserMapper ysmUserMapper,SchoolMapper schoolMapper) {
YsmUserController.ysmUserMapper = ysmUserMapper; YsmUserController.ysmUserMapper = ysmUserMapper;
YsmUserController.schoolMapper = schoolMapper;
} }
/** /**
...@@ -126,4 +125,32 @@ public class YsmUserController extends BaseController { ...@@ -126,4 +125,32 @@ public class YsmUserController extends BaseController {
wrapper.setSqlSelect("id,user_name as userName"); wrapper.setSqlSelect("id,user_name as userName");
return ResponseData.success(ysmUserMapper.selectMaps(wrapper), "查询成功！"); return ResponseData.success(ysmUserMapper.selectMaps(wrapper), "查询成功！");
} }
/**
* 多个地方公用初始县分
* @param substName
* @return
*/
@Permission(menuname = "初始县分", value = "initSubstName", method = RequestMethod.POST)
public ResponseData<List<School>> initSubstName(@RequestParam(name = "substName", required = false) String substName){
Wrapper<School> schoolWrapper = new EntityWrapper<>();
schoolWrapper.groupBy("sub_name");
List<School> list = schoolMapper.selectList(schoolWrapper);
return ResponseData.success(list);
}
/**
* 多个地方公用初始学校
* @param substName
* @return
*/
@Permission(menuname = "初始学校", value = "getSchoolNames", method = RequestMethod.POST)
public ResponseData<List<School>> getSchoolNames(@RequestParam(name = "substName", required = false) String substName){
Wrapper<School> schoolWrapper = new EntityWrapper<>();
schoolWrapper.eq(StringUtils.isNotBlank(substName),"sub_name",substName);
schoolWrapper.groupBy("school_name");
List<School> list = schoolMapper.selectList(schoolWrapper);
return ResponseData.success(list);
}
} }
service-manager/src/main/java/com/winsun/controller/YxtOrderController.java
...@@ -113,18 +113,6 @@ public class YxtOrderController extends BaseController { ...@@ -113,18 +113,6 @@ public class YxtOrderController extends BaseController {
} }
/** /**
* @param substName
* @return
*/
@Permission(menuname = "初始县分", value = "initSubstName", method = RequestMethod.POST)
public ResponseData<List<School>> initSubstName(@RequestParam(name = "substName", required = false) String substName) {
Wrapper<School> schoolWrapper = new EntityWrapper<>();
schoolWrapper.groupBy("sub_name");
List<School> list = schoolMapper.selectList(schoolWrapper);
return ResponseData.success(list);
}
/**
* @param orderId * @param orderId
* @return * @return
*/ */
...@@ -155,19 +143,6 @@ public class YxtOrderController extends BaseController { ...@@ -155,19 +143,6 @@ public class YxtOrderController extends BaseController {
page.setTotal(couponList.size()); page.setTotal(couponList.size());
return ResponseData.success(page); return ResponseData.success(page);
} }
/**
* @param substName
* @return
*/
@Permission(menuname = "初始县分", value = "getSchoolNames", method = RequestMethod.POST)
public ResponseData<List<School>> getSchoolNames(@RequestParam(name = "substName", required = false) String substName) {
Wrapper<School> schoolWrapper = new EntityWrapper<>();
schoolWrapper.eq(StringUtils.isNotBlank(substName), "sub_name", substName);
schoolWrapper.groupBy("school_name");
List<School> list = schoolMapper.selectList(schoolWrapper);
return ResponseData.success(list);
}
/** /**
* @param name * @param name
......
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