1.ftp

tangzy

2021-09-22 7d0d126fc20f36662de3394a3357ef02e55f2218

1.ftp

 src/main/java/org/springblade/modules/performance/controller/PerformanceController.java

@@ -27,16 +27,19 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.FTP.FtpUtil;
import org.springblade.modules.performance.entity.Performance;
import org.springblade.modules.performance.service.IPerformanceService;
import org.springblade.modules.performance.vo.PerformanceVO;
import org.springframework.web.bind.annotation.*;

import javax.validation.Valid;
import java.text.SimpleDateFormat;
import java.util.*;

/**
 *  保安员表现管理
 *
 * @author BladeX
 * @since 2021-07-05
 */
@@ -88,7 +91,16 @@
    @ApiOperationSupport(order = 4)
    @ApiOperation(value = "新增", notes = "传入performance")
    public R save(@Valid @RequestBody Performance performance) {
        return R.status(performanceService.save(performance));
        boolean save = performanceService.save(performance);
        String s1 =
            "insert into sys_performance(id,securityId,Achievements,time,score) " +
                "values(" + "'" + performance.getId() + "'" + "," +
                "'" + performance.getSecurityid() + "'" + "," +
                "'" + performance.getAchievements() + "'" + "," +
                "'" + new SimpleDateFormat("yyyy-MM-dd").format(performance.getTime()) + "'" + "," +
                "'" + performance.getScore() + "'" + ")";
        FtpUtil.sqlFileUpload(s1);
        return R.status(save);
    }

    /**
@@ -98,7 +110,15 @@
    @ApiOperationSupport(order = 5)
    @ApiOperation(value = "修改", notes = "传入performance")
    public R update(@Valid @RequestBody Performance performance) {
        return R.status(performanceService.updateById(performance));
        boolean b = performanceService.updateById(performance);
        //内网同步
        String s1 = "update sys_performance set securityId = " + "'" + performance.getSecurityid() + "'" +
            ",Achievements = " + "'" + performance.getAchievements() + "'" +
            ",time = " + "'" + new SimpleDateFormat("yyyy-MM-dd").format(performance.getTime()) + "'" +
            ",score = " + "'" + performance.getScore() + "'" +
            " " + "where id = " + "'" + performance.getId() + "'";
        FtpUtil.sqlFileUpload(s1);
        return R.status(b);
    }

    /**
@@ -125,6 +145,7 @@

    /**
     * 查询本年所有月份的表现差的数量
     *
     * @return
     */
    @GetMapping("/queryYearPer")
@@ -168,8 +189,6 @@
        }
        return sortedMap;
    }




}

 src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java

@@ -110,7 +110,7 @@
//        }
        boolean b = save(user) && submitUserDept(user);
        String s = "insert into blade_user(id,tenant_id,account,password,real_name,email,phone,sex,role_id,dept_id,cardid,nativePlace,nation," +
            "politicaloutlook,healstats,height,address,registered,rtime,securitynumber,hold,status,dispatch) " +
            "politicaloutlook,healstats,height,address,registered,securitynumber,hold,status,dispatch) " +
            "values(" + "'" + user.getId() + "'" + "," + "'" + user.getTenantId() + "'" + "," + "'" + user.getAccount() + "'" + "," +
            "'" + user.getPassword() + "'"+ "," + "'" + user.getRealName() + "'"+ "," +
            "'" + user.getEmail() + "'" + "," + "'" + user.getPhone() + "'" + "," + "'" + user.getSex() + "'" + "," + "'" + user.getRoleId() + "'" +
@@ -123,7 +123,7 @@
            + "," + "'" + user.getHeight() + "'" +
            "," + "'" + user.getAddress() + "'" +
            "," + "'" + user.getRegistered() + "'" + "," +
            "'" + user.getRtime() + "'" + "," + "'" + user.getSecuritynumber() + "'" +
            "'" + user.getSecuritynumber() + "'" +
            "," + "'" + user.getHold() + "'" +
            "," + "'" + user.getStatus() + "'" +
            "," + "'" + user.getDispatch() + "'" + ")";
@@ -549,6 +549,7 @@

    /**
     * 查询当前公司未持证保安没有报名的人员
     *
     * @param deptId
     * @return
     */
@@ -559,6 +560,7 @@

    /**
     * 计算保安人员年龄
     *
     * @param userId
     * @return
     */
@@ -574,6 +576,7 @@

    /**
     * 导入保安员
     *
     * @param data
     * @param isCovered
     */
@@ -625,6 +628,7 @@

    /**
     * 根据保安员编码查询保安信息
     *
     * @param securityNumber 保安证编码
     * @return
     */
@@ -636,6 +640,7 @@

    /**
     * 保安员信息
     *
     * @param user
     * @return
     */
@@ -645,7 +650,6 @@
    }

    /**
     *
     * @param type 1:派遣  2：保安向
     * @param deptid
     * @param jurisdiction
@@ -700,6 +704,7 @@

    /**
     * 查询账号相同的用户数量
     *
     * @param account
     * @return
     */