Compare commits
6 Commits
63698a5501
...
4f8fcfc1e1
| Author | SHA1 | Date |
|---|---|---|
 钱涛
|
4f8fcfc1e1 | |
|
钱涛
|
0ba4c40f45 | |
|
钱涛
|
8b1fe9ed3f | |
|
钱涛
|
55c8680ab2 | |
|
钱涛
|
ffe8c88392 | |
 dxfeng
|
0cea01300d |
|
|
@ -45,4 +45,6 @@ public class InsuranceExportParam extends BaseQueryParam {
|
|||
private List<Long> taxAgents;
|
||||
|
||||
private String workcode;
|
||||
private List<Long> departmentIds;
|
||||
private List<Long> subCompanyIds;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@
|
|||
LEFT JOIN hrmdepartment d ON d.id = e.departmentid
|
||||
LEFT JOIN hrmsubcompany c ON c.id = e.subcompanyid1
|
||||
where e.status not in (7)
|
||||
<include refid="paramSql"/>
|
||||
|
||||
<!-- 排序 -->
|
||||
<if test="param.orderRule != null">
|
||||
|
|
@ -51,6 +52,7 @@
|
|||
LEFT JOIN hrmdepartment d ON d.id = e.departmentid
|
||||
LEFT JOIN hrmsubcompany c ON c.id = e.subcompanyid1
|
||||
where e.status not in (7)
|
||||
<include refid="paramSql"/>
|
||||
|
||||
<!-- 排序 -->
|
||||
<if test="param.orderRule != null">
|
||||
|
|
@ -79,6 +81,7 @@
|
|||
LEFT JOIN hrmdepartment d ON d.id = e.departmentid
|
||||
LEFT JOIN hrmsubcompany c ON c.id = e.subcompanyid1
|
||||
where e.status not in (7)
|
||||
<include refid="paramSql"/>
|
||||
|
||||
<!-- 排序 -->
|
||||
<if test="param.orderRule != null">
|
||||
|
|
@ -96,6 +99,7 @@
|
|||
LEFT JOIN hrmresource e ON e.ID = a.employee_id
|
||||
LEFT JOIN hrmdepartment d ON d.id = e.departmentid
|
||||
where e.status not in (7)
|
||||
<include refid="paramSql"/>
|
||||
|
||||
</select>
|
||||
<select id="exportExcelAccount" resultType="com.engine.salary.entity.siexport.po.ExcelAccountExportPO" databaseId="oracle">
|
||||
|
|
@ -108,6 +112,7 @@
|
|||
LEFT JOIN hrmresource e ON e.ID = a.employee_id
|
||||
LEFT JOIN hrmdepartment d ON d.id = e.departmentid
|
||||
where e.status not in (7)
|
||||
<include refid="paramSql"/>
|
||||
|
||||
</select>
|
||||
<select id="exportExcelAccount" resultType="com.engine.salary.entity.siexport.po.ExcelAccountExportPO" databaseId="sqlserver">
|
||||
|
|
@ -120,6 +125,7 @@
|
|||
LEFT JOIN hrmresource e ON e.ID = a.employee_id
|
||||
LEFT JOIN hrmdepartment d ON d.id = e.departmentid
|
||||
where e.status not in (7)
|
||||
<include refid="paramSql"/>
|
||||
|
||||
</select>
|
||||
|
||||
|
|
@ -147,6 +153,7 @@
|
|||
LEFT JOIN hrmdepartment d ON d.id = e.departmentid
|
||||
LEFT JOIN hrmsubcompany c ON c.id = e.subcompanyid1
|
||||
where e.status not in (7)
|
||||
<include refid="paramSql"/>
|
||||
|
||||
<!-- 排序 -->
|
||||
<if test="param.orderRule != null">
|
||||
|
|
@ -176,6 +183,7 @@
|
|||
LEFT JOIN hrmdepartment d ON d.id = e.departmentid
|
||||
LEFT JOIN hrmsubcompany c ON c.id = e.subcompanyid1
|
||||
where e.status not in (7)
|
||||
<include refid="paramSql"/>
|
||||
|
||||
<!-- 排序 -->
|
||||
<if test="param.orderRule != null">
|
||||
|
|
@ -205,6 +213,7 @@
|
|||
LEFT JOIN hrmdepartment d ON d.id = e.departmentid
|
||||
LEFT JOIN hrmsubcompany c ON c.id = e.subcompanyid1
|
||||
where e.status not in (7)
|
||||
<include refid="paramSql"/>
|
||||
|
||||
<!-- 排序 -->
|
||||
<if test="param.orderRule != null">
|
||||
|
|
@ -233,6 +242,7 @@
|
|||
LEFT JOIN hrmdepartment d ON d.id = e.department_id
|
||||
LEFT JOIN hrmsubcompany c ON c.id = e.subcompany_id
|
||||
where e.status not in (7)
|
||||
<include refid="extParamSql"/>
|
||||
<!-- 排序 -->
|
||||
</select>
|
||||
<select id="exportExtAccount" resultType="com.engine.salary.entity.siexport.po.AccountExportPO" databaseId="oracle">
|
||||
|
|
@ -256,6 +266,7 @@
|
|||
LEFT JOIN hrmdepartment d ON d.id = e.department_id
|
||||
LEFT JOIN hrmsubcompany c ON c.id = e.subcompany_id
|
||||
where e.status not in (7)
|
||||
<include refid="extParamSql"/>
|
||||
<!-- 排序 -->
|
||||
</select>
|
||||
<select id="exportExtAccount" resultType="com.engine.salary.entity.siexport.po.AccountExportPO" databaseId="sqlserver">
|
||||
|
|
@ -279,6 +290,7 @@
|
|||
LEFT JOIN hrmdepartment d ON d.id = e.department_id
|
||||
LEFT JOIN hrmsubcompany c ON c.id = e.subcompany_id
|
||||
where e.status not in (7)
|
||||
<include refid="extParamSql"/>
|
||||
<!-- 排序 -->
|
||||
</select>
|
||||
|
||||
|
|
@ -293,6 +305,7 @@
|
|||
LEFT JOIN hrsa_external_employee e ON e.ID = a.employee_id
|
||||
LEFT JOIN hrmdepartment d ON d.id = e.department_id
|
||||
where e.status not in (7)
|
||||
<include refid="extParamSql"/>
|
||||
</select>
|
||||
<select id="exportExtExcelAccount" resultType="com.engine.salary.entity.siexport.po.ExcelAccountExportPO" databaseId="oracle">
|
||||
SELECT
|
||||
|
|
@ -305,6 +318,7 @@
|
|||
LEFT JOIN hrsa_external_employee e ON e.ID = a.employee_id
|
||||
LEFT JOIN hrmdepartment d ON d.id = e.department_id
|
||||
where e.status not in (7)
|
||||
<include refid="extParamSql"/>
|
||||
</select>
|
||||
<select id="exportExtExcelAccount" resultType="com.engine.salary.entity.siexport.po.ExcelAccountExportPO" databaseId="sqlserver">
|
||||
SELECT
|
||||
|
|
@ -317,5 +331,113 @@
|
|||
LEFT JOIN hrsa_external_employee e ON e.ID = a.employee_id
|
||||
LEFT JOIN hrmdepartment d ON d.id = e.department_id
|
||||
where e.status not in (7)
|
||||
<include refid="extParamSql"/>
|
||||
</select>
|
||||
|
||||
<sql id="paramSql">
|
||||
<if test="param.workcode != null and param.workcode != ''">
|
||||
AND e.workcode like CONCAT('%',#{param.workcode},'%')
|
||||
</if>
|
||||
<if test="param.departmentIds != null and param.departmentIds.size()>0">
|
||||
AND e.departmentid IN
|
||||
<foreach collection="param.departmentIds" open="(" item="departmentId" separator="," close=")">
|
||||
#{departmentId}
|
||||
</foreach>
|
||||
</if>
|
||||
<if test="param.subCompanyIds != null and param.subCompanyIds.size()>0">
|
||||
AND e.subcompanyid1 IN
|
||||
<foreach collection="param.subCompanyIds" open="(" item="subCompanyId" separator="," close=")">
|
||||
#{subCompanyId}
|
||||
</foreach>
|
||||
</if>
|
||||
</sql>
|
||||
<sql id="paramSql" databaseId="oracle">
|
||||
<if test="param.workcode != null and param.workcode != ''">
|
||||
AND e.workcode like '%'||#{param.workcode}||'%'
|
||||
</if>
|
||||
<if test="param.departmentIds != null and param.departmentIds.size()>0">
|
||||
AND e.departmentid IN
|
||||
<foreach collection="param.departmentIds" open="(" item="departmentId" separator="," close=")">
|
||||
#{departmentId}
|
||||
</foreach>
|
||||
</if>
|
||||
<if test="param.subCompanyIds != null and param.subCompanyIds.size()>0">
|
||||
AND e.subcompanyid1 IN
|
||||
<foreach collection="param.subCompanyIds" open="(" item="subCompanyId" separator="," close=")">
|
||||
#{subCompanyId}
|
||||
</foreach>
|
||||
</if>
|
||||
</sql>
|
||||
|
||||
<sql id="paramSql" databaseId="sqlserver">
|
||||
<if test="param.workcode != null and param.workcode != ''">
|
||||
AND e.workcode like '%'+#{param.workcode}+'%'
|
||||
</if>
|
||||
<if test="param.departmentIds != null and param.departmentIds.size()>0">
|
||||
AND e.departmentid IN
|
||||
<foreach collection="param.departmentIds" open="(" item="departmentId" separator="," close=")">
|
||||
#{departmentId}
|
||||
</foreach>
|
||||
</if>
|
||||
<if test="param.subCompanyIds != null and param.subCompanyIds.size()>0">
|
||||
AND e.subcompanyid1 IN
|
||||
<foreach collection="param.subCompanyIds" open="(" item="subCompanyId" separator="," close=")">
|
||||
#{subCompanyId}
|
||||
</foreach>
|
||||
</if>
|
||||
</sql>
|
||||
|
||||
<sql id="extParamSql">
|
||||
<if test="param.workcode != null and param.workcode != ''">
|
||||
AND e.workcode like CONCAT('%',#{param.workcode},'%')
|
||||
</if>
|
||||
<if test="param.departmentIds != null and param.departmentIds.size()>0">
|
||||
AND e.department_id IN
|
||||
<foreach collection="param.departmentIds" open="(" item="departmentId" separator="," close=")">
|
||||
#{departmentId}
|
||||
</foreach>
|
||||
</if>
|
||||
<if test="param.subCompanyIds != null and param.subCompanyIds.size()>0">
|
||||
AND e.subcompany_id IN
|
||||
<foreach collection="param.subCompanyIds" open="(" item="subCompanyId" separator="," close=")">
|
||||
#{subCompanyId}
|
||||
</foreach>
|
||||
</if>
|
||||
</sql>
|
||||
|
||||
<sql id="extParamSql" databaseId="oracle">
|
||||
<if test="param.workcode != null and param.workcode != ''">
|
||||
AND e.workcode like '%'||#{param.workcode}||'%'
|
||||
</if>
|
||||
<if test="param.departmentIds != null and param.departmentIds.size()>0">
|
||||
AND e.department_id IN
|
||||
<foreach collection="param.departmentIds" open="(" item="departmentId" separator="," close=")">
|
||||
#{departmentId}
|
||||
</foreach>
|
||||
</if>
|
||||
<if test="param.subCompanyIds != null and param.subCompanyIds.size()>0">
|
||||
AND e.subcompany_id IN
|
||||
<foreach collection="param.subCompanyIds" open="(" item="subCompanyId" separator="," close=")">
|
||||
#{subCompanyId}
|
||||
</foreach>
|
||||
</if>
|
||||
</sql>
|
||||
|
||||
<sql id="extParamSql" databaseId="sqlserver">
|
||||
<if test="param.workcode != null and param.workcode != ''">
|
||||
AND e.workcode like '%'+#{param.workcode}+'%'
|
||||
</if>
|
||||
<if test="param.departmentIds != null and param.departmentIds.size()>0">
|
||||
AND e.department_id IN
|
||||
<foreach collection="param.departmentIds" open="(" item="departmentId" separator="," close=")">
|
||||
#{departmentId}
|
||||
</foreach>
|
||||
</if>
|
||||
<if test="param.subCompanyIds != null and param.subCompanyIds.size()>0">
|
||||
AND e.subcompany_id IN
|
||||
<foreach collection="param.subCompanyIds" open="(" item="subCompanyId" separator="," close=")">
|
||||
#{subCompanyId}
|
||||
</foreach>
|
||||
</if>
|
||||
</sql>
|
||||
</mapper>
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ public class TaxDeclarationApiFlowStatisticServiceImpl extends Service implement
|
|||
return TaxDeclarationApiFlowTotalDTO.builder()
|
||||
.total(apiConfigPO.getTotality())
|
||||
.remain(apiConfigPO.getRemain())
|
||||
.used(Long.parseLong(response.getBody().getSurplus()))
|
||||
.used(Long.parseLong(response.getBody().getUsed()))
|
||||
.lastUpdateTime(SalaryDateUtil.getFormatLocalDateTime(apiConfigPO.getLastUpdateTime()))
|
||||
.build();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@ import com.engine.salary.encrypt.AESEncryptUtil;
|
|||
import com.engine.salary.entity.salaryBill.param.SalaryBillGetTokenParam;
|
||||
import com.engine.salary.exception.SalaryRunTimeException;
|
||||
import com.engine.salary.util.db.IdGenerator;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import weaver.conn.RecordSet;
|
||||
import weaver.general.BaseBean;
|
||||
|
|
@ -23,6 +24,7 @@ import java.time.LocalDateTime;
|
|||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
@Slf4j
|
||||
public class SalaryTokenUtil {
|
||||
|
||||
/**
|
||||
|
|
@ -126,8 +128,10 @@ public class SalaryTokenUtil {
|
|||
heads.put("appid", appid);
|
||||
heads.put("cpk", cpk);
|
||||
// 调用ECOLOGY系统接口进行注册
|
||||
String data = post(httpKey + ip + "/api/ec/dev/auth/regist", null, heads);
|
||||
String url = httpKey + ip + "/api/ec/dev/auth/regist";
|
||||
String data = post(url , null, heads);
|
||||
Map<String, Object> datas = JSONObject.parseObject(data, new TypeReference<Map<String, Object>>() {});
|
||||
log.info("GetToken regist url {} ,heads {}, data: {}",url ,heads, data);
|
||||
// ECOLOGY返回的系统公钥
|
||||
String spk = (String) (datas.get("spk"));
|
||||
RSA rsa = new RSA();
|
||||
|
|
@ -138,16 +142,20 @@ public class SalaryTokenUtil {
|
|||
sql = String.format("insert into hrsa_salary_sys_conf(id, conf_key, conf_value, title, module, order_weight, delete_type, create_time, update_time) values (%s,'%s','%s','%s','%s',%s,%s,'%s','%s')",
|
||||
IdGenerator.generate(), "SALARY_TOKEN_SECRET", secret, "token", "basic",0,0,date,date);
|
||||
rs.execute(sql);
|
||||
log.info("GetToken regist secret , sql: {}", sql);
|
||||
// 保存spk
|
||||
sql = String.format("insert into hrsa_salary_sys_conf(id, conf_key, conf_value, title, module, order_weight, delete_type, create_time, update_time) values (%s,'%s','%s','%s','%s',%s,%s,'%s','%s')",
|
||||
IdGenerator.generate(), "SALARY_TOKEN_SPK", spk, "spk", "basic",0,0,date,date);
|
||||
rs.execute(sql);
|
||||
log.info("GetToken regist spk , sql: {}", sql);
|
||||
}
|
||||
//封装参数到请求头
|
||||
heads.put("appid", appid);
|
||||
heads.put("secret", secret);
|
||||
//调用ECOLOGY系统接口进行注册
|
||||
String data2 = post(httpKey + ip + "/api/ec/dev/auth/applytoken", null, heads);
|
||||
String url = httpKey + ip + "/api/ec/dev/auth/applytoken";
|
||||
String data2 = post(url, null, heads);
|
||||
log.info("GetToken=====applytoken url {} ,heads {}, data: {}",url ,heads, data2);
|
||||
// 通过第一步注册许可时返回spk公钥对userid进行加密生成的密文
|
||||
sql= " SELECT conf_value FROM hrsa_salary_sys_conf t WHERE delete_type = 0 AND conf_key = 'SALARY_TOKEN_SPK'";
|
||||
rs.execute(sql);
|
||||
|
|
|
|||
|
|
@ -112,8 +112,14 @@ public class SIExportController {
|
|||
@Path("/common/export")
|
||||
@Produces(MediaType.APPLICATION_OCTET_STREAM)
|
||||
public Response exportAccount(@Context HttpServletRequest request, @Context HttpServletResponse response,
|
||||
@QueryParam("billMonth") String billMonth,@QueryParam("paymentOrganization") String paymentOrganization) {
|
||||
InsuranceExportParam param = InsuranceExportParam.builder().billMonth(billMonth).paymentOrganization(paymentOrganization).build();
|
||||
@QueryParam("billMonth") String billMonth,@QueryParam("paymentOrganization") String paymentOrganization,@QueryParam("departmentIds") String departmentIds,@QueryParam("subCompanyIds") String subCompanyIds,@QueryParam("workcode") String workcode) {
|
||||
InsuranceExportParam param = InsuranceExportParam.builder().billMonth(billMonth).paymentOrganization(paymentOrganization).workcode(workcode).build();
|
||||
if(StringUtils.isNotBlank(departmentIds)){
|
||||
param.setDepartmentIds(Arrays.stream(departmentIds.split(",")).map(Long::parseLong).collect(Collectors.toList()));
|
||||
}
|
||||
if(StringUtils.isNotBlank(subCompanyIds)){
|
||||
param.setSubCompanyIds(Arrays.stream(subCompanyIds.split(",")).map(Long::parseLong).collect(Collectors.toList()));
|
||||
}
|
||||
User user = HrmUserVarify.getUser(request, response);
|
||||
XSSFWorkbook workbook = getSIExportWrapper(user).exportAccount(PaymentStatusEnum.COMMON.getValue(),param);
|
||||
String time = LocalDate.now().toString();
|
||||
|
|
|
|||
Loading…
Reference in New Issue