5、薪资账套中编辑账套增加所属城市；薪资核算页面中增加所属城市且可以通过所有城市进行筛选

resource/sqlupgrade/DM/sql202512300103SHQZJRXXFW.sql

@@ -0,0 +1,3 @@
+alter table hrsa_salary_sob add city varchar2(200) null;
+/
+

resource/sqlupgrade/GS/sql202512300103SHQZJRXXFW.sql

@@ -0,0 +1,3 @@
+alter table hrsa_salary_sob add city varchar2(200) null;
+/
+

resource/sqlupgrade/JC/sql202512300103SHQZJRXXFW.sql

@@ -0,0 +1,3 @@
+alter table hrsa_salary_sob add city varchar2(200) null;
+/
+

resource/sqlupgrade/Mysql/sql202512300103SHQZJRXXFW.sql

@@ -0,0 +1 @@
+alter table hrsa_salary_sob add city varchar(200) null;

resource/sqlupgrade/Oracle/sql202512300103SHQZJRXXFW.sql

@@ -0,0 +1,2 @@
+alter table hrsa_salary_sob add city varchar2(200) null
+/

resource/sqlupgrade/PG/sql202512300103SHQZJRXXFW.sql

@@ -0,0 +1 @@
+alter table hrsa_salary_sob add city varchar(200) null;

resource/sqlupgrade/SQLServer/sql202512300103SHQZJRXXFW.sql

@@ -0,0 +1,2 @@
+alter table hrsa_salary_sob add city varchar(200) null
+GO

resource/sqlupgrade/ST/sql202512300103SHQZJRXXFW.sql

@@ -0,0 +1,3 @@
+alter table hrsa_salary_sob add city varchar2(200) null;
+/
+

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<Long, Long> empSizeMap = SalaryEntityUtil.convert2Map(salaryAcctEmployeeCountDTOS, SalaryAcctEmployeeCountDTO::getSalaryAcctRecordId, SalaryAcctEmployeeCountDTO::getCountBySalaryAcctRecordId);
         Map<Long, Boolean> salarySendMap = SalaryEntityUtil.convert2Map(salarySendCheckResult, SalarySendCheckDTO::getSalaryAcctId, SalarySendCheckDTO::isSendFinished);
         Map<Long, String> 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());

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;
 

src/com/engine/salary/entity/salaryacct/param/SalaryAcctRecordQueryParam.java

@@ -37,6 +37,8 @@ public class SalaryAcctRecordQueryParam extends BaseQueryParam {
      */
     private List<Long> taxAgentIds;
 
+    private List<Long> cityIds;
+
     private String startMonthStr;
     private String endMonthStr;
 

src/com/engine/salary/entity/salaryacct/po/SalaryAcctRecordPO.java

@@ -167,6 +167,8 @@ public class SalaryAcctRecordPO {
     //薪资账套id
     Collection<Long> salarySobIds;
 
+    Collection<Long> cityIds;
+
     //税款所属期
     LocalDateRange salaryMonths;
 

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<RoleInfo> cityData;
+
     /**
      * 薪资周期
      * @see SalaryCycleTypeEnum

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;

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;
 }

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<Long> ids;
 
 

src/com/engine/salary/mapper/salaryacct/SalaryAcctRecordMapper.xml

@@ -135,6 +135,12 @@
                 #{salarySobId}
             </foreach>
         </if>
+        <if test="cityIds != null and cityIds.size()>0">
+            AND t.city IN
+            <foreach collection="cityIds" open="(" item="city" separator="," close=")">
+                #{city}
+            </foreach>
+        </if>
         <if test="salaryMonths != null and salaryMonths.fromDate != null">
             AND t.salary_month <![CDATA[ >= ]]> #{salaryMonths.fromDate}
         </if>

src/com/engine/salary/mapper/salarysob/SalarySobMapper.xml

@@ -19,6 +19,7 @@
         <result column="delete_type" property="deleteType"/>
         <result column="tenant_key" property="tenantKey"/>
         <result column="tax_agent_id" property="taxAgentId"/>
+        <result column="city" property="city"/>
         <collection property="taxAgentIds" ofType="long" >
             <constructor>
                 <arg column="taxAgentId"/>
@@ -47,6 +48,7 @@
         , t.delete_type
         , t.tenant_key
         , t.tax_agent_id
+        , t.city
         , l.tax_agent_id as taxAgentId
     </sql>
 
@@ -198,6 +200,9 @@
             <if test="taxAgentId != null">
                 tax_agent_id,
             </if>
+            <if test="city != null">
+                city,
+            </if>
         </trim>
         <trim prefix="VALUES (" suffix=")" suffixOverrides=",">
             <if test="id != null">
@@ -251,6 +256,9 @@
             <if test="taxAgentId != null">
                 #{taxAgentId},
             </if>
+            <if test="city != null">
+                #{city},
+            </if>
         </trim>
     </insert>
 
@@ -315,6 +323,9 @@
             <if test="taxAgentId != null">
                 tax_agent_id,
             </if>
+            <if test="city != null">
+                city,
+            </if>
         </trim>
         <trim prefix="VALUES (" suffix=")" suffixOverrides=",">
             <if test="id != null">
@@ -368,6 +379,9 @@
             <if test="taxAgentId != null">
                 #{taxAgentId},
             </if>
+            <if test="city != null">
+                #{city},
+            </if>
         </trim>
     </insert>
 
@@ -447,6 +461,9 @@
             <if test="taxAgentId != null">
                 tax_agent_id=#{taxAgentId},
             </if>
+            <if test="city != null">
+                city=#{city},
+            </if>
         </set>
         WHERE id = #{id} AND delete_type = 0
     </update>

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())

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);
 

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<SalarySobPO> page = getSalarySobService(user).listPageByParam(queryParam);
         // 薪资账套po转换成薪资账套列表dto
         List<TaxAgentPO> taxAgentPOS = getTaxAgentService(user).listAll();
-
+        CityComInfo cityComInfo = new CityComInfo();
 
         List<SalarySobListDTO> 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);