xn

src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbjbb.java

@@ -296,7 +296,10 @@ public class EmSbjbb implements Serializable {
     private String tsksrq;
 
     private String sbyxzt;
+
     private String whsj;
+    private Integer xqrs;
+    private String gz;
 
 
 }

src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbjgry.java

@@ -1,5 +1,6 @@
 package com.dsic.gj_erp.bean.jcsj;
 
+import com.alibaba.excel.annotation.format.DateTimeFormat;
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -37,13 +38,24 @@ public class EmSbjgry implements Serializable {
     private String gx;
 
     @ApiModelProperty(value = "休假时间范围")
-    private String xjsj;
+    @DateTimeFormat("yyyy/MM/dd")
+    private String xjsjKs;
+    @ApiModelProperty(value = "休假时间范围")
+    @DateTimeFormat("yyyy/MM/dd")
+    private String xjsjJs;
+
+    @ApiModelProperty(value = "所属部门")
+    private String szcs;
 
     @ApiModelProperty(value = "默认设备")
-    private String sb;
+    private String sbmc;
+
+    @ApiModelProperty(value = "设备编号")
+    private String sbbh;
 
-    @ApiModelProperty(value = "状态；0在职1离职")
+    @ApiModelProperty(value = "状态；01在职02离职")
     private String zt;
+    private String gz;
 
 
     @TableId(value = "id", type = IdType.ASSIGN_UUID)

src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjh.java

@@ -34,6 +34,8 @@ public class DmYdjh implements Serializable {
     @ApiModelProperty(value = "批量")
     private String dcPl;
 
+    @TableField(exist = false)
+    private String xzglxq;
     @ApiModelProperty(value = "领取类型")
     @TableField("LQLB")
     private String lqlb;
@@ -232,6 +234,8 @@ public class DmYdjh implements Serializable {
     private String db;
     private String cx;
     private String txc;
+    private String jhlx="0";
 
+    private String jssjOld;
 
 }

src/main/java/com/dsic/gj_erp/controller/ApiController.java

@@ -8,6 +8,7 @@ import com.dsic.gj_erp.exception.CustomException;
 import com.dsic.gj_erp.mapper.SyuserMapper;
 import com.dsic.gj_erp.service.ApiService;
 import com.dsic.gj_erp.service.sy.SYService;
+import com.dsic.gj_erp.util.IPUtils;
 import com.dsic.gj_erp.util.MD5Util;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import java.net.InetAddress;
 import java.util.Map;
 
 @Api(tags = "系统级API")
@@ -33,7 +35,7 @@ public class ApiController {
     @Autowired
     SYService syService;
     @RequestMapping(value = "/login")
-    public ResultBean login(@RequestBody @Validated LoginBean loginBean) throws CustomException {
+    public ResultBean login(@RequestBody @Validated LoginBean loginBean) throws Exception {
 //        List<String> list=new ArrayList<>();
 //        for (int i = 0; i < 10; i++) {
 //            String a= syService.f_getpjh("DM","DM","CZPL");
@@ -42,7 +44,9 @@ public class ApiController {
 //        }
 //        System.out.println(list);
 //        //
-
+//        String hostAddress = InetAddress.getLocalHost().getHostAddress();
+//        System.out.print("hostAddress ");
+//        System.out.println(hostAddress);
         return new ResultBean(apiService.userLogin(loginBean));
     }
 
@@ -51,7 +55,11 @@ public class ApiController {
     public ResultBean getInfo(HttpServletRequest request) {
         String yhdm = (String) request.getAttribute("yhdm");
         String zxtdm = (String) request.getAttribute("zxtdm");
-//
+
+            ;
+        System.out.print("IpAddr ");
+        System.out.println(IPUtils.getIpAddr(request));
+
         Map<String, Object> map= apiService.getInfo(yhdm);
         map.put("menu", syuserMapper.getUserMenu(yhdm, zxtdm));
         return new ResultBean(map);

src/main/java/com/dsic/gj_erp/controller/jcsj/EmSbjbbController.java

@@ -5,6 +5,7 @@ import com.dsic.gj_erp.annotation.AuthFunction;
 import com.dsic.gj_erp.bean.ResultBean;
 import com.dsic.gj_erp.bean.jcsj.EmSbjbb;
 import com.dsic.gj_erp.bean.request.EmSbjbbBean;
+import com.dsic.gj_erp.bean.sy.Dm_zhbmp;
 import com.dsic.gj_erp.service.jcsj.EmSbjbbService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -17,6 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -85,7 +87,6 @@ public class EmSbjbbController {
     @PostMapping(value = "/getSBLX")
     public ResultBean getSBLX() {
         List<Map> emSbjbbs= emSbjbbService.getSBLX();
-
         return new ResultBean(emSbjbbs);
     }
 

src/main/java/com/dsic/gj_erp/controller/jcsj/EmSbjgryController.java

@@ -2,11 +2,13 @@ package com.dsic.gj_erp.controller.jcsj;
 
 
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.dsic.gj_erp.annotation.AuthFunction;
 import com.dsic.gj_erp.bean.ResultBean;
 import com.dsic.gj_erp.bean.jcsj.EmSbcnp;
+import com.dsic.gj_erp.bean.jcsj.EmSbjbb;
 import com.dsic.gj_erp.bean.jcsj.EmSbjgry;
 import com.dsic.gj_erp.service.jcsj.EmSbcnpService;
 import com.dsic.gj_erp.service.jcsj.EmSbjgryService;
@@ -20,6 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -39,7 +42,8 @@ public class EmSbjgryController {
     @ApiOperation(value = "查询")
     @PostMapping(value = "/getList")
     public ResultBean getList(@RequestBody EmSbjgry ry) {
-        List<EmSbjgry> emSbjgryList= emSbjgryService.list(new QueryWrapper<EmSbjgry>().eq("gx",ry.getGx()));
+        List<EmSbjgry> emSbjgryList= emSbjgryService.list(new QueryWrapper<EmSbjgry>()
+                .eq(StrUtil.isNotEmpty(ry.getGx()),"gx",ry.getGx()));
         return new ResultBean(emSbjgryList);
     }
 
@@ -66,7 +70,8 @@ public class EmSbjgryController {
     @ApiOperation(value = "批量删除")
     @PostMapping(value = "/delete")
     public ResultBean delete(@RequestBody List<EmSbjgry> emSbjgryList) {
-        emSbjgryService.removeByIds(emSbjgryList);
+        List<String> idList=emSbjgryList.stream().map(EmSbjgry::getId).collect(Collectors.toList());
+        emSbjgryService.removeByIds(idList);
 
         return new ResultBean();
     }

src/main/java/com/dsic/gj_erp/controller/jhgk/DmQfxqController.java

@@ -9,8 +9,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.dsic.gj_erp.annotation.AuthFunction;
 import com.dsic.gj_erp.bean.ResultBean;
 import com.dsic.gj_erp.bean.jcsj.DmCbxxp;
+import com.dsic.gj_erp.bean.jcsj.EmSbjgry;
 import com.dsic.gj_erp.bean.jhgk.DmQfxq;
-import com.dsic.gj_erp.bean.jhgk.DmSygdxq;
 import com.dsic.gj_erp.bean.jhgk.excel.GdxqExcel;
 import com.dsic.gj_erp.bean.jhgk.excel.GdxqExcel1;
 import com.dsic.gj_erp.bean.jhgk.excel.QfExcel;
@@ -26,6 +26,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -101,7 +102,8 @@ public class DmQfxqController {
     @RequestMapping("/remove")
     @AuthFunction
     public ResultBean remove(@RequestBody List<DmQfxq> qfxqs) {
-        service.removeByIds(qfxqs);
+        List<String> idList=qfxqs.stream().map(DmQfxq::getId).collect(Collectors.toList());
+        service.removeByIds(idList);
         return new ResultBean();
     }
 

src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdxqController.java

@@ -16,6 +16,7 @@ import com.dsic.gj_erp.bean.jhgk.excel.GdxqExcel1;
 import com.dsic.gj_erp.exception.CustomException;
 import com.dsic.gj_erp.listeners.ExcelGdxq1Listener;
 import com.dsic.gj_erp.listeners.ExcelGdxqListener;
+import com.dsic.gj_erp.service.jhgk.DmSygdMxService;
 import com.dsic.gj_erp.service.jhgk.DmSygdxqService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -40,7 +41,8 @@ public class DmSygdxqController {
 
     @Autowired
     private DmSygdxqService service;
-
+    @Autowired
+    private DmSygdMxService sygdMxService;
     @RequestMapping("/getList")
     @AuthFunction
     public ResultBean getList(@RequestBody Map<String, String> map) {
@@ -72,7 +74,7 @@ public class DmSygdxqController {
         String day=DateUtil.format(DateUtil.date(), "yyyy/MM/dd");
         service.saveXzList(list,username,day);
         service.saveDzList(list1,username,day);
-
+        sygdMxService.sygdPC();
         return new ResultBean();
     }
 

src/main/java/com/dsic/gj_erp/service/jcsj/EmSbjbbService.java

@@ -3,6 +3,7 @@ package com.dsic.gj_erp.service.jcsj;
 
 import cn.hutool.json.JSONObject;
 import com.baomidou.mybatisplus.extension.service.IService;
+
 import com.dsic.gj_erp.bean.jcsj.EmSbjbb;
 import com.dsic.gj_erp.bean.request.EmSbjbbBean;
 

src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbjbbServiceImpl.java

@@ -4,6 +4,7 @@ package com.dsic.gj_erp.service.jcsj.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
 import com.dsic.gj_erp.bean.jcsj.EmSbjbb;
 import com.dsic.gj_erp.bean.request.EmSbjbbBean;
 import com.dsic.gj_erp.dao.jcsj.EmSbjbbRepository;

src/main/java/com/dsic/gj_erp/service/jhgk/DmYdjhService.java

@@ -16,7 +16,7 @@ import java.util.Map;
  * @author xn
  * @since 2023-11-09
  */
-public interface DmYdjhService extends IService<DmYdjh> {
+public interface  DmYdjhService extends IService<DmYdjh> {
 
 
     List<DmSygdMx> tjydjh();

src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmQfxqServiceImpl.java

@@ -1,7 +1,9 @@
 package com.dsic.gj_erp.service.jhgk.impl;
 
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -142,10 +144,28 @@ public class DmQfxqServiceImpl extends ServiceImpl<DmQfxqMapper, DmQfxq> impleme
 //            ydjhService.remove(new QueryWrapper<DmYdjh>()
 //                    .eq("Dc_Ch",dmYdjh.getDcCh())
 //                    .eq("Dc_Pl",dmYdjh.getDcPl())
-//                    .eq("Tzbh",dmYdjh.getTzbh()));
+//                    .eq("Tzbh",dmYdjh.getTzbh())
+//            );
 //        }
         Map<String, List<DmYdjh>> map = ydjhList.stream().collect(Collectors.groupingBy(mx -> mx.getDcCh() +"@"+ mx.getDcPl()));
         this.removeByMulti(map);
+        ydjhList.forEach(l->{
+            if (StrUtil.isAllNotEmpty(l.getXzglxq(),l.getJssj())){
+                //状态 2拖期 1提前 3追加
+                if (l.getXzglxq().compareTo(l.getJssj())<0){
+                    if (!DateUtil.isSameMonth(DateUtil.parseDate(l.getXzglxq()),DateUtil.parseDate(l.getJssj()))){
+                        l.setJhlx("3");
+                    }else {
+                        l.setJhlx("1");
+                    }
+                }
+                if (l.getXzglxq().compareTo(l.getJssj())>0){
+                    l.setJhlx("2");
+                }
+                l.setJssjOld(StrUtil.isEmpty(l.getJssj())?"":l.getJssj());
+                l.setJssj(l.getXzglxq());
+            }
+        });
         ydjhService.saveBatch(ydjhList);
 
 

src/main/java/com/dsic/gj_erp/util/IPUtils.java

@@ -0,0 +1,57 @@
+    package com.dsic.gj_erp.util;
+
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * IP地址
+ * 
+ * @Author xhj
+ * @Date 2021年04月18日
+ */
+public class IPUtils {
+	private static Logger logger = LoggerFactory.getLogger(IPUtils.class);
+	/**
+	 * 获取IP地址
+	 * 
+	 * 使用Nginx等反向代理软件， 则不能通过request.getRemoteAddr()获取IP地址
+	 * 如果使用了多级反向代理的话，X-Forwarded-For的值并不止一个，而是一串IP地址，X-Forwarded-For中第一个非unknown的有效IP字符串，则为真实IP地址
+	 */
+	public static String getIpAddr(HttpServletRequest request) {
+    	String ip = null;
+
+        try {
+            ip = request.getHeader("x-forwarded-for");
+            if (StringUtils.isBlank(ip) || "unknown".equalsIgnoreCase(ip)) {
+                ip = request.getHeader("Proxy-Client-IP");
+            }
+            if (StringUtils.isBlank(ip) || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+                ip = request.getHeader("WL-Proxy-Client-IP");
+            }
+            if (StringUtils.isBlank(ip) || "unknown".equalsIgnoreCase(ip)) {
+                ip = request.getHeader("HTTP_CLIENT_IP");
+            }
+            if (StringUtils.isBlank(ip) || "unknown".equalsIgnoreCase(ip)) {
+                ip = request.getHeader("HTTP_X_FORWARDED_FOR");
+            }
+            if (StringUtils.isBlank(ip) || "unknown".equalsIgnoreCase(ip)) {
+                ip = request.getRemoteAddr();
+            }
+        } catch (Exception e) {
+        	logger.error("IPUtils ERROR ", e);
+        }
+        
+        //使用代理，则获取第一个IP地址
+//        if(StringUtils.isEmpty(ip) && ip.length() > 15) {
+//			if(ip.indexOf(",") > 0) {
+//				ip = ip.substring(0, ip.indexOf(","));
+//			}
+//		}
+        
+        return ip;
+    }
+	
+}

src/main/resources/mappers/jhgk/DmQfxqMapper.xml

@@ -54,7 +54,7 @@
             dm_sygd_mx.bcqpyld,
             dm_sygd_mx.ylbhgg,
             dm_sygd_mx.xxr,
-            dm_sygd_mx.gjjs_dz
+        dm_qfxq.dzglxq as gjjs_dz
         from
             (SELECT * from (
                                SELECT