diff --git a/resource/sqlupgrade/DM/sql202512300103SHQZJRXXFW.sql b/resource/sqlupgrade/DM/sql202512300103SHQZJRXXFW.sql new file mode 100644 index 000000000..6d3c09ef7 --- /dev/null +++ b/resource/sqlupgrade/DM/sql202512300103SHQZJRXXFW.sql @@ -0,0 +1,3 @@ +alter table hrsa_salary_sob add city varchar2(200) null; +/ + diff --git a/resource/sqlupgrade/GS/sql202512300103SHQZJRXXFW.sql b/resource/sqlupgrade/GS/sql202512300103SHQZJRXXFW.sql new file mode 100644 index 000000000..6d3c09ef7 --- /dev/null +++ b/resource/sqlupgrade/GS/sql202512300103SHQZJRXXFW.sql @@ -0,0 +1,3 @@ +alter table hrsa_salary_sob add city varchar2(200) null; +/ + diff --git a/resource/sqlupgrade/JC/sql202512300103SHQZJRXXFW.sql b/resource/sqlupgrade/JC/sql202512300103SHQZJRXXFW.sql new file mode 100644 index 000000000..6d3c09ef7 --- /dev/null +++ b/resource/sqlupgrade/JC/sql202512300103SHQZJRXXFW.sql @@ -0,0 +1,3 @@ +alter table hrsa_salary_sob add city varchar2(200) null; +/ + diff --git a/resource/sqlupgrade/Mysql/sql202512300103SHQZJRXXFW.sql b/resource/sqlupgrade/Mysql/sql202512300103SHQZJRXXFW.sql new file mode 100644 index 000000000..4ca11d471 --- /dev/null +++ b/resource/sqlupgrade/Mysql/sql202512300103SHQZJRXXFW.sql @@ -0,0 +1 @@ +alter table hrsa_salary_sob add city varchar(200) null; \ No newline at end of file diff --git a/resource/sqlupgrade/Oracle/sql202512300103SHQZJRXXFW.sql b/resource/sqlupgrade/Oracle/sql202512300103SHQZJRXXFW.sql new file mode 100644 index 000000000..502533bcf --- /dev/null +++ b/resource/sqlupgrade/Oracle/sql202512300103SHQZJRXXFW.sql @@ -0,0 +1,2 @@ +alter table hrsa_salary_sob add city varchar2(200) null +/ \ No newline at end of file diff --git a/resource/sqlupgrade/PG/sql202512300103SHQZJRXXFW.sql b/resource/sqlupgrade/PG/sql202512300103SHQZJRXXFW.sql new file mode 100644 index 000000000..4ca11d471 --- /dev/null +++ b/resource/sqlupgrade/PG/sql202512300103SHQZJRXXFW.sql @@ -0,0 +1 @@ +alter table hrsa_salary_sob add city varchar(200) null; \ No newline at end of file diff --git a/resource/sqlupgrade/SQLServer/sql202512300103SHQZJRXXFW.sql b/resource/sqlupgrade/SQLServer/sql202512300103SHQZJRXXFW.sql new file mode 100644 index 000000000..c791284e5 --- /dev/null +++ b/resource/sqlupgrade/SQLServer/sql202512300103SHQZJRXXFW.sql @@ -0,0 +1,2 @@ +alter table hrsa_salary_sob add city varchar(200) null +GO \ No newline at end of file diff --git a/resource/sqlupgrade/ST/sql202512300103SHQZJRXXFW.sql b/resource/sqlupgrade/ST/sql202512300103SHQZJRXXFW.sql new file mode 100644 index 000000000..6d3c09ef7 --- /dev/null +++ b/resource/sqlupgrade/ST/sql202512300103SHQZJRXXFW.sql @@ -0,0 +1,3 @@ +alter table hrsa_salary_sob add city varchar2(200) null; +/ + diff --git a/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctRecordBO.java b/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctRecordBO.java index 1a534b2f9..915169ba4 100644 --- a/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctRecordBO.java +++ b/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctRecordBO.java @@ -19,6 +19,7 @@ import com.google.common.collect.Lists; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.math.NumberUtils; +import weaver.hrm.city.CityComInfo; import java.util.*; import java.util.stream.Collectors; @@ -59,6 +60,7 @@ public class SalaryAcctRecordBO { Map empSizeMap = SalaryEntityUtil.convert2Map(salaryAcctEmployeeCountDTOS, SalaryAcctEmployeeCountDTO::getSalaryAcctRecordId, SalaryAcctEmployeeCountDTO::getCountBySalaryAcctRecordId); Map salarySendMap = SalaryEntityUtil.convert2Map(salarySendCheckResult, SalarySendCheckDTO::getSalaryAcctId, SalarySendCheckDTO::isSendFinished); Map taxAgentMap = SalaryEntityUtil.convert2Map(taxAgentPOS, TaxAgentPO::getId, TaxAgentPO::getName); + CityComInfo cityComInfo = new CityComInfo(); return salaryAcctRecordPOS.stream() .map(salaryAcctRecordPO -> { SalarySobPO salarySobPO = salarySobMap.get(salaryAcctRecordPO.getSalarySobId()); @@ -109,6 +111,7 @@ public class SalaryAcctRecordBO { .approvalStatus(salaryAcctRecordPO.getApprovalStatus()) .runStatus(salaryAcctRecordPO.getRunStatus()) .operate(btnList) + .city(cityComInfo.getCityname(salarySobPO.getCity())) .opts(salaryAcctRecordPO.getOpts()) .build(); }).collect(Collectors.toList()); diff --git a/src/com/engine/salary/entity/salaryacct/dto/SalaryAcctRecordListDTO.java b/src/com/engine/salary/entity/salaryacct/dto/SalaryAcctRecordListDTO.java index f383583be..0c8cc7d3b 100644 --- a/src/com/engine/salary/entity/salaryacct/dto/SalaryAcctRecordListDTO.java +++ b/src/com/engine/salary/entity/salaryacct/dto/SalaryAcctRecordListDTO.java @@ -64,6 +64,9 @@ public class SalaryAcctRecordListDTO { @TableTitle(title = "备注", dataIndex = "description", key = "description") private String description; + @TableTitle(title = "所属城市", dataIndex = "city", key = "city") + private String city; + @TableTitle(title = "审批状态", dataIndex = "approvalStatus", key = "approvalStatus") private String approvalStatus; diff --git a/src/com/engine/salary/entity/salaryacct/param/SalaryAcctRecordQueryParam.java b/src/com/engine/salary/entity/salaryacct/param/SalaryAcctRecordQueryParam.java index 983d2cdf5..135486918 100644 --- a/src/com/engine/salary/entity/salaryacct/param/SalaryAcctRecordQueryParam.java +++ b/src/com/engine/salary/entity/salaryacct/param/SalaryAcctRecordQueryParam.java @@ -37,6 +37,8 @@ public class SalaryAcctRecordQueryParam extends BaseQueryParam { */ private List taxAgentIds; + private List cityIds; + private String startMonthStr; private String endMonthStr; diff --git a/src/com/engine/salary/entity/salaryacct/po/SalaryAcctRecordPO.java b/src/com/engine/salary/entity/salaryacct/po/SalaryAcctRecordPO.java index c409beaab..d06a1767a 100644 --- a/src/com/engine/salary/entity/salaryacct/po/SalaryAcctRecordPO.java +++ b/src/com/engine/salary/entity/salaryacct/po/SalaryAcctRecordPO.java @@ -167,6 +167,8 @@ public class SalaryAcctRecordPO { //薪资账套id Collection salarySobIds; + Collection cityIds; + //税款所属期 LocalDateRange salaryMonths; diff --git a/src/com/engine/salary/entity/salarysob/dto/SalarySobBasicFormDTO.java b/src/com/engine/salary/entity/salarysob/dto/SalarySobBasicFormDTO.java index 77b7221d7..c8397bd3b 100644 --- a/src/com/engine/salary/entity/salarysob/dto/SalarySobBasicFormDTO.java +++ b/src/com/engine/salary/entity/salarysob/dto/SalarySobBasicFormDTO.java @@ -1,6 +1,7 @@ package com.engine.salary.entity.salarysob.dto; import com.engine.salary.component.WeaFormOption; +import com.engine.salary.entity.hrm.RoleInfo; import com.engine.salary.enums.SalaryCycleTypeEnum; import com.engine.salary.enums.SalarySobStatusEnum; import com.engine.salary.enums.salarysob.IncomeCategoryEnum; @@ -51,6 +52,8 @@ public class SalarySobBasicFormDTO { */ private Integer taxableItems; + private List cityData; + /** * 薪资周期 * @see SalaryCycleTypeEnum diff --git a/src/com/engine/salary/entity/salarysob/dto/SalarySobListDTO.java b/src/com/engine/salary/entity/salarysob/dto/SalarySobListDTO.java index 4d892d643..efc962f31 100644 --- a/src/com/engine/salary/entity/salarysob/dto/SalarySobListDTO.java +++ b/src/com/engine/salary/entity/salarysob/dto/SalarySobListDTO.java @@ -59,6 +59,10 @@ public class SalarySobListDTO { @SalaryTableColumn(text = "薪资周期起始日期", width = "10%", column = "salaryCycleFromDay", display = false) private String salaryCycleFromDay; + @SalaryTableColumn(text = "所属城市", width = "10%", column = "city") + @TableTitle(title = "所属城市", key = "city", dataIndex = "city") + private String city; + @SalaryTableColumn(text = "启用", width = "10%", column = "disable") @TableTitle(title = "启用", key = "disable", dataIndex = "disable") private Integer disable; diff --git a/src/com/engine/salary/entity/salarysob/param/SalarySobBasicSaveParam.java b/src/com/engine/salary/entity/salarysob/param/SalarySobBasicSaveParam.java index ddaf3f41b..8f87c538b 100644 --- a/src/com/engine/salary/entity/salarysob/param/SalarySobBasicSaveParam.java +++ b/src/com/engine/salary/entity/salarysob/param/SalarySobBasicSaveParam.java @@ -97,4 +97,9 @@ public class SalarySobBasicSaveParam { */ @DataCheck(max = 80, message = "备注不能超过80个字符") private String description; + + /** + * 所属城市 + */ + private String city; } diff --git a/src/com/engine/salary/entity/salarysob/po/SalarySobPO.java b/src/com/engine/salary/entity/salarysob/po/SalarySobPO.java index e2c2e177e..fb031a6fc 100644 --- a/src/com/engine/salary/entity/salarysob/po/SalarySobPO.java +++ b/src/com/engine/salary/entity/salarysob/po/SalarySobPO.java @@ -182,6 +182,12 @@ public class SalarySobPO { @XStreamAsAttribute private String tenantKey; + + @ElogTransform( name="所属城市" ) + @XStreamAlias("city") + @XStreamAsAttribute + private String city; + Collection ids; diff --git a/src/com/engine/salary/mapper/salaryacct/SalaryAcctRecordMapper.xml b/src/com/engine/salary/mapper/salaryacct/SalaryAcctRecordMapper.xml index 06de4deec..2afe0c14a 100644 --- a/src/com/engine/salary/mapper/salaryacct/SalaryAcctRecordMapper.xml +++ b/src/com/engine/salary/mapper/salaryacct/SalaryAcctRecordMapper.xml @@ -135,6 +135,12 @@ #{salarySobId} + + AND t.city IN + + #{city} + + AND t.salary_month = ]]> #{salaryMonths.fromDate} diff --git a/src/com/engine/salary/mapper/salarysob/SalarySobMapper.xml b/src/com/engine/salary/mapper/salarysob/SalarySobMapper.xml index dc81cec68..bd6bce7e5 100644 --- a/src/com/engine/salary/mapper/salarysob/SalarySobMapper.xml +++ b/src/com/engine/salary/mapper/salarysob/SalarySobMapper.xml @@ -19,6 +19,7 @@ + @@ -47,6 +48,7 @@ , t.delete_type , t.tenant_key , t.tax_agent_id + , t.city , l.tax_agent_id as taxAgentId @@ -198,6 +200,9 @@ tax_agent_id, + + city, + @@ -251,6 +256,9 @@ #{taxAgentId}, + + #{city}, + @@ -315,6 +323,9 @@ tax_agent_id, + + city, + @@ -368,6 +379,9 @@ #{taxAgentId}, + + #{city}, + @@ -447,6 +461,9 @@ tax_agent_id=#{taxAgentId}, + + city=#{city}, + WHERE id = #{id} AND delete_type = 0 diff --git a/src/com/engine/salary/service/impl/SalarySobInitServiceImpl.java b/src/com/engine/salary/service/impl/SalarySobInitServiceImpl.java index 2dc977dee..94a3119e4 100644 --- a/src/com/engine/salary/service/impl/SalarySobInitServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalarySobInitServiceImpl.java @@ -117,6 +117,7 @@ public class SalarySobInitServiceImpl extends AbstractSalarySobInitService { .setSocialSecurityCycleType(saveParam.getSocialSecurityCycleType()) .setDisable(0) .setDescription(saveParam.getDescription()) + .setCity(saveParam.getCity()) // .setOriginSalarySobId(saveParam.getId()) .setTenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY) .setCreator((long) env.getCurrentUser().getUID()) diff --git a/src/com/engine/salary/service/impl/SalarySobServiceImpl.java b/src/com/engine/salary/service/impl/SalarySobServiceImpl.java index b3fc0eb7f..16997e639 100644 --- a/src/com/engine/salary/service/impl/SalarySobServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalarySobServiceImpl.java @@ -575,6 +575,7 @@ public class SalarySobServiceImpl extends Service implements SalarySobService { .setAttendCycleFromDay(saveParam.getAttendCycleFromDay()) .setSocialSecurityCycleType(saveParam.getSocialSecurityCycleType()) .setDescription(saveParam.getDescription()) + .setCity(saveParam.getCity()) .setUpdateTime(new Date()); salarySobMapper.updateById(newSalarySobPO); diff --git a/src/com/engine/salary/wrapper/SalarySobWrapper.java b/src/com/engine/salary/wrapper/SalarySobWrapper.java index 7a4296775..221f57d7d 100644 --- a/src/com/engine/salary/wrapper/SalarySobWrapper.java +++ b/src/com/engine/salary/wrapper/SalarySobWrapper.java @@ -1,8 +1,10 @@ package com.engine.salary.wrapper; +import cn.hutool.core.convert.Convert; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; import com.engine.salary.constant.SalaryDefaultTenantConstant; +import com.engine.salary.entity.hrm.RoleInfo; import com.engine.salary.entity.salaryitem.bo.SysSalaryItemBO; import com.engine.salary.entity.salaryitem.po.SalaryItemPO; import com.engine.salary.entity.salaryitem.po.SysSalaryItemPO; @@ -31,6 +33,7 @@ import com.engine.salary.util.db.IdGenerator; import com.engine.salary.util.page.PageInfo; import org.apache.commons.collections4.CollectionUtils; import weaver.hrm.User; +import weaver.hrm.city.CityComInfo; import java.util.*; import java.util.stream.Collectors; @@ -92,7 +95,7 @@ public class SalarySobWrapper extends Service { PageInfo page = getSalarySobService(user).listPageByParam(queryParam); // 薪资账套po转换成薪资账套列表dto List taxAgentPOS = getTaxAgentService(user).listAll(); - + CityComInfo cityComInfo = new CityComInfo(); List salarySobListDTOS = page.getList().stream() .map(salarySobPO -> { @@ -105,6 +108,7 @@ public class SalarySobWrapper extends Service { .taxAgentIds(taxAgentIds) .salaryCycle(SalarySobBO.buildSalaryCycle(salarySobPO)) .disable(salarySobPO.getDisable()) + .city(cityComInfo.getCityname(salarySobPO.getCity())) .description(salarySobPO.getDescription()) .opts(salarySobPO.getOpts()) .build(); @@ -223,6 +227,8 @@ public class SalarySobWrapper extends Service { } // 薪资装套po转换成薪资账套详情dto basicForm = SalarySobBO.convert2FormDTO(basicForm, salarySobPO); + String citynameame = new CityComInfo().getCityname(salarySobPO.getCity()); + basicForm.setCityData(Collections.singletonList(RoleInfo.builder().id(Convert.toLong(salarySobPO.getCity())).name(citynameame).build())); } // 转换成前端所需的数据格式 data.put("basicForm", basicForm);