Browse Source

首页获取最近打卡信息修改

anderx 1 year ago
parent
commit
2b7bdff59a

+ 3 - 23
src/main/java/com/goafanti/weChat/controller/AdminReleaseApiController.java

@@ -67,7 +67,6 @@ public class AdminReleaseApiController extends CertifyApiController{
 
 	/**
 	 * 修改外出申请、修改公出
-	 * @return
 	 */
 	@RequestMapping(value = "/updatePublicRelease", method = RequestMethod.POST)
 	public Result updatePublicRelease(InputPublicRelease in){
@@ -86,8 +85,6 @@ public class AdminReleaseApiController extends CertifyApiController{
 
 	/**
 	 * 修改打卡地址
-	 * @param in
-	 * @return
 	 */
 	@RequestMapping(value = "/updateLocation", method = RequestMethod.POST)
 	public Result updateLocation(InputPublicRelease in){
@@ -106,12 +103,11 @@ public class AdminReleaseApiController extends CertifyApiController{
 
 	/**
 	 * 外出打卡、公出打卡
-	 * @return
 	 */
 	@RequestMapping(value = "/publicReleaseClockIn", method = RequestMethod.POST)
 	public Result publicReleaseClockIn(Integer id,String photoUrl,Integer clockIn ,String clockInRemarks,String uid ){
 		Result res =new Result();
-		Integer x=publicReleaseService.pushPublicReleaseClockIn(id,photoUrl,clockIn,clockInRemarks,uid);
+		int x=publicReleaseService.pushPublicReleaseClockIn(id,photoUrl,clockIn,clockInRemarks,uid);
 		if (x==-1){
 			res.getError().add(buildError("公出他人企业!需通过审核,才可以打卡!"));
 			return res;
@@ -125,7 +121,6 @@ public class AdminReleaseApiController extends CertifyApiController{
 	}
 	/**
 	 * 外出申请详情
-	 * @return
 	 */
 	@RequestMapping(value = "/dtails", method = RequestMethod.GET)
 	public Result dtails(Integer id){
@@ -137,7 +132,6 @@ public class AdminReleaseApiController extends CertifyApiController{
 
 	/**
 	 * 外出申请详情
-	 * @return
 	 */
 	@RequestMapping(value = "/followDtails", method = RequestMethod.GET)
 	public Result followDtails(String id){
@@ -148,7 +142,6 @@ public class AdminReleaseApiController extends CertifyApiController{
 
 	/**
 	 * 外出申请列表.公出列表
-	 * @return
 	 */
 	@RequestMapping(value = "/listPublicRelease", method = RequestMethod.GET)
 	public Result listPublicRelease(InputPublicReleaseList in){
@@ -159,7 +152,6 @@ public class AdminReleaseApiController extends CertifyApiController{
 
 	/**
 	 * 公出审核、外出审核 上级
-	 * @return
 	 */
 	@RequestMapping(value = "/examinePublicRelease", method = RequestMethod.POST)
 	public Result examinePublicRelease(Integer id ,Integer status,String remarks){
@@ -182,7 +174,6 @@ public class AdminReleaseApiController extends CertifyApiController{
 
 	/**
 	 * 公出审核、外出审核 营销
-	 * @return
 	 */
 	@RequestMapping(value = "/marketersExamine", method = RequestMethod.POST)
 	public Result marketersExamine(Integer id ,Integer status,String remarks){
@@ -226,7 +217,6 @@ public class AdminReleaseApiController extends CertifyApiController{
 
 	/**
 	 * 咨询驳回
-	 * @return
 	 */
 	@RequestMapping(value = "/techReject", method = RequestMethod.POST)
 	public Result techReject(Integer id ,String remarks){
@@ -247,7 +237,6 @@ public class AdminReleaseApiController extends CertifyApiController{
 
 	/**
 	 * 外出审核日志列表
-	 * @return
 	 */
 	@RequestMapping(value = "/listPublicReleaseLog", method = RequestMethod.GET)
 	public Result listPublicReleaseLog(Integer id,String ufid){
@@ -260,7 +249,6 @@ public class AdminReleaseApiController extends CertifyApiController{
 
 	/**
 	 * 公出统计
-	 * @return
 	 */
 	@RequestMapping(value = "/publicReleaseStatistics", method = RequestMethod.GET)
 	public Result publicReleaseStatistics(InputPublicStatistics in){
@@ -271,7 +259,6 @@ public class AdminReleaseApiController extends CertifyApiController{
 
 	/**
 	 * 公出统计导出
-	 * @return
 	 */
 	@RequestMapping(value = "/publicReleaseStatistics/export", method = RequestMethod.GET)
 	public Result publicReleaseStatisticsExport(InputPublicStatistics in,HttpServletResponse response){
@@ -283,7 +270,6 @@ public class AdminReleaseApiController extends CertifyApiController{
 
 	/**
 	 * 公出详情列表
-	 * @return
 	 */
 	@RequestMapping(value = "/publicReleaseDtails", method = RequestMethod.GET)
 	public Result publicReleaseListDtails(InputPublicDtails in){
@@ -302,16 +288,14 @@ public class AdminReleaseApiController extends CertifyApiController{
 
 	/**
 	 * 公出详情列表
-	 * @return
 	 */
 	@RequestMapping(value = "/publicReleaseDtails/export", method = RequestMethod.GET)
 	public Result publicReleaseListDtailsExport(InputPublicDtails in ,Integer exportType){
 		if (exportType==null)exportType=0;
 		List<OutPublicDtails> outList=publicReleaseService.publicReleaseListDtailsList(in);
 		if (exportType==0){
-			List<OutPublicDtails> list=outList;
-			NewExcelUtil<OutPublicDtails>excel=new NewExcelUtil<>(OutPublicDtails.class);
-			return  excel.exportExcel(list,"公出详细列表",uploadPath);
+            NewExcelUtil<OutPublicDtails>excel=new NewExcelUtil<>(OutPublicDtails.class);
+			return  excel.exportExcel(outList,"公出详细列表",uploadPath);
 		}else if (exportType==1){
 			List<OutPublicDtailsFinance> list = new ArrayList<>();
 			for (OutPublicDtails outPublicDtails : outList) {
@@ -339,7 +323,6 @@ public class AdminReleaseApiController extends CertifyApiController{
 
 	/**
 	 * 搜索
-	 * @return
 	 */
 	@RequestMapping(value = "/addSupplement", method = RequestMethod.POST)
 	public Result addSupplement(Integer id,String supplement,String nextPlan){
@@ -390,7 +373,6 @@ public class AdminReleaseApiController extends CertifyApiController{
 
 	/**
 	 * 打卡页面获取自己最新的打卡
-	 * @return
 	 */
 	@RequestMapping(value = "/getMyNewPublic",method = RequestMethod.GET)
 	public Result getMyNewPublic (){
@@ -403,7 +385,6 @@ public class AdminReleaseApiController extends CertifyApiController{
 	 * 新增协单助手
 	 * @param id 公出编号
 	 * @param aid 协单助手编号
-	 * @return
 	 */
 	@RequestMapping(value = "/addAssistant",method = RequestMethod.POST)
 	public Result addAssistant (Integer id,String aid){
@@ -424,7 +405,6 @@ public class AdminReleaseApiController extends CertifyApiController{
 	 * 删除协单助手
 	 * @param id 公出编号
 	 * @param aid 协单助手编号
-	 * @return
 	 */
 	@RequestMapping(value = "/deleteAssistant",method = RequestMethod.POST)
 	public Result deleteAssistant (Integer id,String aid){